Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r59c5e4243a25a96bf9a2e9b0ef0e1b4958f9d534 -r653d8e860cd6038af533e2fe222a9a938f585a52
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 59c5e4243a25a96bf9a2e9b0ef0e1b4958f9d534)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 653d8e860cd6038af533e2fe222a9a938f585a52)
@@ -137,7 +137,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 },
@@ -159,10 +158,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 },
     { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                                   &testSetResetSafetyShutdownOverride },
 #ifdef __PUMPTEST__