Index: HDDefs.h
===================================================================
diff -u -rc6f10dab0825623948cbc8139bc8b9fe4a4024c8 -ra42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9
--- HDDefs.h	(.../HDDefs.h)	(revision c6f10dab0825623948cbc8139bc8b9fe4a4024c8)
+++ HDDefs.h	(.../HDDefs.h)	(revision a42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9)
@@ -101,25 +101,14 @@
 {
     STANDBY_START_STATE = 0,                            ///< Start standby
     STANDBY_WAIT_FOR_TREATMENT_STATE,                   ///< Wait for treatment
-    STANDBY_WAIT_FOR_DISINFECT_STATE,                   ///< Wait for UI to send disinfection option
+    STANDBY_WAIT_FOR_DISINFECT_STATE,                   ///< Wait for UI to send disinfect option
     STANDBY_DG_FLUSH_IN_PROGRESS_STATE,                 ///< DG flush operation is in progress
-    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,        ///< DG heat disinfection operation is in progress
-    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,        ///< DG chemical disinfection operation is in progress
+    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,        ///< DG heat disinfect operation is in progress
+    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,        ///< DG chemical disinfect 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
 
-/// Sub-mode states while in standby mode disinfect
-enum DG_Disinfect_States
-{
-    DG_DISINFECT_FLUSH_STATE = 0,                       ///< DG disinfect flush
-    DG_DISINFECT_HEAT_STATE,                            ///< DG disinfect heat
-    DG_DISINFECT_CHEM_STATE,                            ///< DG disinfect chemical
-    DG_DISINFECT_NOT_RUNNING_STATE,                     ///< 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
-
 /**@}*/
 
 /**