Index: HDDefs.h
===================================================================
diff -u -re6c5a4ccb65ae109e9b1c754f97bc117a0e7f269 -re508294f3a5857c9e9ab4d7c4b0dce27c23c3b36
--- HDDefs.h	(.../HDDefs.h)	(revision e6c5a4ccb65ae109e9b1c754f97bc117a0e7f269)
+++ HDDefs.h	(.../HDDefs.h)	(revision e508294f3a5857c9e9ab4d7c4b0dce27c23c3b36)
@@ -104,7 +104,18 @@
     STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,        ///< DG chemical disinfection operation is in progress
     NUM_OF_STANDBY_STATES                               ///< Number of standby states (sub-modes)
 };
-typedef enum HD_Standby_States HD_STANDBY_STATE_T;      ///< Type for HD standby states enumeration
+typedef enum HD_Standby_States HD_STANDBY_STATE_T;      ///< Type for HD standby states enumeration
+
+/// Sub-mode states while in standby mode disinfect
+enum DG_Disinfect_States
+{
+    DG_DISINFECT_FLUSH = 0,                             ///< DG disinfect flush
+    DG_DISINFECT_HEAT,                                  ///< DG disinfect heat
+    DG_DISINFECT_CHEM,                                  ///< DG disinfect chemical
+    DG_DISINFECT_NOT_RUNNING,                           ///< DG disinfect not running
+    NUM_OF_DG_DISINFECT_STATES                          ///< Number of DG disinfect states
+};
+typedef enum DG_Disinfect_States DG_DISINFECT_STATE_T;  ///< Type for DG disinfect states that are broadcast to UI
 
 /**@}*/
 
Index: MsgDefs.h
===================================================================
diff -u -rbbf6135565ea7e6bcb1c8e0efd9e09768e026fd8 -re508294f3a5857c9e9ab4d7c4b0dce27c23c3b36
--- MsgDefs.h	(.../MsgDefs.h)	(revision bbf6135565ea7e6bcb1c8e0efd9e09768e026fd8)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision e508294f3a5857c9e9ab4d7c4b0dce27c23c3b36)
@@ -185,8 +185,6 @@
     MSG_ID_HD_SERIAL_NUMBER = 0x99,                                     ///< HD serial number
     MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST = 0x9A,            ///< HD set standby disinfect submode request
     MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE = 0x9B,           ///< HD set standby disinfect submode response
-    MSG_ID_HD_DISINFECTS_UI_STATE_READINGS_FROM_DG = 0x9C,              ///< HD disinfects UI states readings from DG
-    MSG_ID_HD_DISINFECTS_UI_STATES_DATA = 0x9D,                         ///< HD disinfects UI state data
 
 
 #ifdef EMC_TEST_BUILD