Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r0687e1ce03e73a64c51cde7a6c8216bec7187fc7 -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0687e1ce03e73a64c51cde7a6c8216bec7187fc7)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
@@ -136,7 +136,6 @@
     { MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                           &testTDCommunicationStatusOverride },
     { MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST,                                    &testDDOpModePublishIntervalOverride },
     { MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST,                                &testSetOperationMode },
-    { MSG_ID_DD_START_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,                          &testDDStartGenDialysateOverride },
     { MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST,                        &testDialysatePumpStartStopOverride },
     { MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,                            &testDDGenDialysateDataPublishIntervalOverride },
     { MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST,                      &testConcentratePumpStartStopOverride },
@@ -158,10 +157,7 @@
     { MSG_ID_DD_HEATERS_PWM_PERIOD_OVERIDE_REQUEST,                                 &testHeaterPWMPeriodOverride },
     { MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,                        &testDDPreGenDialysateDataPublishIntervalOverride },
     { MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,                       &testDDPostGenDialysateDataPublishIntervalOverride },
-    { MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,                      &testDDStartPreGenDialysateOverride },
     { MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA,                                     &handlePreGenDialysateRequestMsg },
-    { MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,                       &testDDStopPreGenDialysateOverride },
-    { MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,                           &testDDStopGenDialysateOverride },
     { MSG_ID_FW_VERSIONS_REQUEST,                                                   &handleVersionRequestMessage },
 #ifdef __PUMPTEST__
     { MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDPistonPumpControlDataPublishIntervalOverride },