Index: MsgDefs.h
===================================================================
diff -u -ra80be9f5d45abcf4447055776410c6a6e41206d8 -r18e2bed2d341627edb5c31c17a952d440bc4a85f
--- MsgDefs.h	(.../MsgDefs.h)	(revision a80be9f5d45abcf4447055776410c6a6e41206d8)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 18e2bed2d341627edb5c31c17a952d440bc4a85f)
@@ -124,9 +124,6 @@
     MSG_ID_DD_UF_DATA = 0x5C,                                                       ///< DD ultrafiltration data
     MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D,                                            ///< FP Permeate tank broadcast data
 
-#ifdef __PUMPTEST__
-    MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0,                                      ///< DD piston pump data
-#endif
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE,                   ///< TD tester log-in
@@ -259,11 +256,6 @@
     MSG_ID_DD_SET_TEST_CONFIGURATION = 0xA043,                                      ///< DD set test configuration
     MSG_ID_DD_GET_TEST_CONFIGURATION = 0xA044,                                      ///< DD get test configuration
     MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0xA045,                               ///< DD reset all the configurations
-    #ifdef __PUMPTEST__
-    MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00,                   ///< DD piston pump data publish interval override request
-    MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01,                     ///< DD piston pump start/stop override request
-    MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02,            ///< DD piston pump fill after dispense control
-#endif
 
     MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000,                                        ///< First FP test message ID
     MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE,                ///< FP tester log-in