Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r12929ac400de74684371b01b962926f868922448 -r229341f9eb23fec730cdf9b1f8f3960de2daf384
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 12929ac400de74684371b01b962926f868922448)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 229341f9eb23fec730cdf9b1f8f3960de2daf384)
@@ -34,9 +34,6 @@
 #include "ModeStandby.h"
 #include "OperationModes.h"
 #include "PAL.h"
-#ifdef __PUMPTEST__
-#include "PistonPumpControl.h"
-#endif
 #include "Pressure.h"
 #include "SafetyShutdown.h"
 #include "SystemCommDD.h"
@@ -167,11 +164,6 @@
     { MSG_ID_DD_SET_TEST_CONFIGURATION,                                             &handleSetTestConfiguration },
     { MSG_ID_DD_GET_TEST_CONFIGURATION,                                             &handleGetTestConfiguration },
     { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS,                                      &handleResetAllTestConfigurations },
-#ifdef __PUMPTEST__
-    { MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDPistonPumpControlDataPublishIntervalOverride },
-    { MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST,                            &testDDPistonPumpStartStopOverride },
-    { MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST,                   &testDDPistonPumpFillAfterDispenseOverride },
-#endif
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))