Index: HDDefs.h
===================================================================
diff -u -rd0db338d0a949260bdfed66a2dade2540c6c0ade -r5c973b51fea2502bce87f7cdae8dd899f4148065
--- HDDefs.h	(.../HDDefs.h)	(revision d0db338d0a949260bdfed66a2dade2540c6c0ade)
+++ HDDefs.h	(.../HDDefs.h)	(revision 5c973b51fea2502bce87f7cdae8dd899f4148065)
@@ -109,28 +109,10 @@
     STANDBY_START_STATE = 0,                                     ///< Start standby (home actuators).
     STANDBY_WAIT_FOR_TREATMENT_STATE,                            ///< Wait for treatment.
     STANDBY_WAIT_FOR_DISINFECT_STATE,                            ///< Wait for UI to send disinfect option.
-
-    STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE,                ///< Wait for DG flush command response.
-    STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE,                    ///< Wait for DG flush to start.
-    STANDBY_DG_FLUSH_IN_PROGRESS_STATE,                          ///< DG flush operation is in progress
-
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE,       ///< Wait for DG heat disinfect command response.
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE,           ///< Wait for DG heat disinfect to start.
-    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,                 ///< DG heat disinfect operation is in progress.
-
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE,       ///< Wait for DG chemical disinfect command response.
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE,           ///< Wait for DG chemical disinfect to start.
-    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,                 ///< DG chemical disinfect operation is in progress
-
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_CMD_RESPONSE_STATE, ///< Wait for DG chemical disinfect flush command response.
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_TO_START_STATE,     ///< Wait for DG chemical disinfect flush to start.
-    STANDBY_DG_CHEM_DISINFECT_FLUSH_IN_PROGRESS_STATE,           ///< DG chemical disinfect flush operation is in progress
-
-    STANDBY_WAIT_FOR_DG_CLEANING_MODE_CMD_RESPONSE_STATE,
-    STANDBY_WAIT_FOR_DG_CLEANING_MODE_TO_START_STATE,
-    STANDBY_CLEANING_MODE_IN_PROGRESS_STATE,
-
-    NUM_OF_STANDBY_STATES                                        ///< Number of standby states (sub-modes)
+    STANDBY_WAIT_FOR_DG_CLEANING_MODE_CMD_RESPONSE_STATE,        ///< Wait for DG cleaning mode command response state.
+    STANDBY_WAIT_FOR_DG_CLEANING_MODE_TO_START_STATE,            ///< Wait for DG cleaning mode to start state.
+    STANDBY_CLEANING_MODE_IN_PROGRESS_STATE,                     ///< Cleaning mode in progress state.
+    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