Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r48ca7fd644c67920acc29a80b7af379d0a134d1a -rb6d20d9e5c704a9f7ebceea9bb12731dac61fc2a
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 48ca7fd644c67920acc29a80b7af379d0a134d1a)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision b6d20d9e5c704a9f7ebceea9bb12731dac61fc2a)
@@ -123,13 +123,11 @@
     MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST,
     MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST,
     MSG_ID_DD_START_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,
-    MSG_ID_DD_DIALYSATE_PUMPS_START_OVERRIDE_REQUEST,
-    MSG_ID_DD_DIALYSATE_PUMPS_STOP_OVERRIDE_REQUEST,                                  //45
-    MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,
-    MSG_ID_DD_CONCENTRATE_PUMPS_START_OVERRIDE_REQUEST,
-    MSG_ID_DD_HEATERS_START_OVERRIDE_REQUEST,
-    MSG_ID_DD_HEATERS_STOP_OVERRIDE_REQUEST,
-    MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST,                               //50
+    MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST,
+    MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,                                //45
+    MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST,
+    MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST,
+    MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST,
 };
 
 /// Message handling function table
@@ -177,13 +175,11 @@
     &testDDOpModePublishIntervalOverride,
     &testSetOperationMode,
     &testDDstartGenDialysateOverride,
-    &testDialysatePumpStartOverride,
-    &testDialysatePumpStopOverride,                                                    //45
-    &testDDGenDialysateDataPublishIntervalOverride,
-    &testConcentratePumpStartOverride,
-    &testHeaterStartOverride,
-    &testHeaterStopOverride,
-    &testValveOpenCloseStateOverride,                                                  //50
+    &testDialysatePumpStartStopOverride,
+    &testDDGenDialysateDataPublishIntervalOverride,                                    //45
+    &testConcentratePumpStartStopOverride,
+    &testHeaterStartStopOverride,
+    &testValveOpenCloseStateOverride,
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))