Index: DDDefs.h
===================================================================
diff -u -r9a74417b0c3c1c13f2fc6e048ba4bb127724ad64 -reed211c09b9bcf9b19621a0f669cedc840b2b310
--- DDDefs.h	(.../DDDefs.h)	(revision 9a74417b0c3c1c13f2fc6e048ba4bb127724ad64)
+++ DDDefs.h	(.../DDDefs.h)	(revision eed211c09b9bcf9b19621a0f669cedc840b2b310)
@@ -278,7 +278,6 @@
     BAL_CHAMBER_STATE2_FILL_START,                          ///< Balancing chamber state 2 fill start state
     BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL,            ///< Balancing Chamber state 2 Bicarb and acid dosing control state
     BAL_CHAMBER_STATE2_FILL_END,                            ///< Balancing Chamber state 2 fill end state
-    BAL_CAHMBER_DIAL_DELVIERY_BYPASS_CHECK,                 ///< Balancing Chamber dialysate delivery bypass check
     BAL_CHAMBER_DIAL_DELIVERY_PAUSE,                        ///< Balancing Chamber dialysate delivery pause
     NUM_OF_BAL_CHAMBER_EXEC_STATES                          ///< Number of balancing chamber states
 };
Index: MsgDefs.h
===================================================================
diff -u -re777056749a5d286f46687010960cfe8dbb92539 -reed211c09b9bcf9b19621a0f669cedc840b2b310
--- MsgDefs.h	(.../MsgDefs.h)	(revision e777056749a5d286f46687010960cfe8dbb92539)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision eed211c09b9bcf9b19621a0f669cedc840b2b310)
@@ -141,13 +141,11 @@
     MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST = 0xA028,                             ///< DD operation mode status override request
     MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST = 0xA029,                         ///< DD set new operation mode override request
     MSG_ID_DD_START_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA02A,                   ///< DD start gen dialysate mode override request
-    MSG_ID_DD_DIALYSATE_PUMPS_START_OVERRIDE_REQUEST = 0xA022,                      ///< DD dialysate pumps start override request
-    MSG_ID_DD_DIALYSATE_PUMPS_STOP_OVERRIDE_REQUEST = 0xA023,                       ///< DD dialysate pumps stop override request
-    MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA024,                     ///< DD generate dialysate mode data publish interval override request
-    MSG_ID_DD_CONCENTRATE_PUMPS_START_OVERRIDE_REQUEST = 0xA025,                    ///< DD Concentrate pumps start override request
-    MSG_ID_DD_HEATERS_START_OVERRIDE_REQUEST = 0xA026,                              ///< DD Heaters start override request
-    MSG_ID_DD_HEATERS_STOP_OVERRIDE_REQUEST = 0xA027,                               ///< DD Heaters stop override request
-    MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST = 0xA028,                    ///< DD Valves open/close state override request
+    MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02B,                 ///< DD dialysate pumps start/stop override request
+    MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02C,                     ///< DD generate dialysate mode data publish interval override request
+    MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02D,               ///< DD Concentrate pumps start/stop override request
+    MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST = 0xA02E,                         ///< DD Heaters start override request
+    MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST = 0xA02F,                    ///< DD Valves open/close state override request
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1,                                     ///< TD debug event text to be logged in event log
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2,                                     ///< DD debug event text to be logged in event log