Index: MsgDefs.h
===================================================================
diff -u -r41cae455633ee6b4c220eb390a1f1401090976b1 -rdcc96b7c8fc5707c5d72f9a6c33abcb71652a879
--- MsgDefs.h	(.../MsgDefs.h)	(revision 41cae455633ee6b4c220eb390a1f1401090976b1)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision dcc96b7c8fc5707c5d72f9a6c33abcb71652a879)
@@ -129,9 +129,7 @@
     MSG_ID_DD_BLOOD_LEAK_DATA = 0x61,                                               ///< DD blood leak data
     MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x62,                                       ///< DD spent chamber fill broadcast data
     MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x63,                                     ///< FP Inlet Pressure Check 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
@@ -276,11 +274,6 @@
     MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C,        ///< DD blood leak intensity moving average override request
     MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D,          ///< DD blood leak zeroing interval in milliseconds override request
     MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E,                                     ///< DD blood leak zero request
-#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