Index: dialin/common/hd_defs.py
===================================================================
diff -u -r5034674f15a54d0adb30c09cd9cb204986fd7f61 -r93c5c784edfb6a81a937b8e56908c4c505441c3c
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 5034674f15a54d0adb30c09cd9cb204986fd7f61)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 93c5c784edfb6a81a937b8e56908c4c505441c3c)
@@ -47,7 +47,6 @@
     STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE             = 11    # DG chemical disinfect operation is in progress
     NUM_OF_STANDBY_STATES                                   = 12    # Number of standby states (sub-modes)
 
-
 @unique
 class HDInitStates(DialinEnum):
     POST_STATE_START                                        =  0    # Start initialize & POST mode state
@@ -78,22 +77,6 @@
     NUM_OF_POST_STATES                                      = 25    # Number of initialize & POST mode states
 
 @unique
-class StandbyStates(DialinEnum):
-    STANDBY_START_STATE                                     = 0,    # Start standby (home actuators).
-    STANDBY_WAIT_FOR_TREATMENT_STATE                        = 1     # Wait for treatment.
-    STANDBY_WAIT_FOR_DISINFECT_STATE                        = 2     # Wait for UI to send disinfect option.
-    STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE            - 3     # Wait for DG flush command response.
-    STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE                = 4     # Wait for DG flush to start.
-    STANDBY_DG_FLUSH_IN_PROGRESS_STATE                      = 5     # DG flush operation is in progress
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE   = 6     # Wait for DG heat disinfect command response.
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE       = 7     # Wait for DG heat disinfect to start.
-    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE             = 8     # DG heat disinfect operation is in progress.
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE   = 9     # Wait for DG chemical disinfect command response.
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE       = 10    # Wait for DG chemical disinfect to start.
-    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE             = 11    # DG chemical disinfect operation is in progress
-    NUM_OF_STANDBY_STATES                                   = 12    # Number of standby states (sub-modes)
-
-@unique
 class PreTreatmentSubModes(DialinEnum):
     HD_PRE_TREATMENT_START_STATE                            =  0    # Start pre-treatment mode state
     HD_PRE_TREATMENT_WATER_SAMPLE_STATE                     =  1    # Water sample state
Index: dialin/hd/hd_events.py
===================================================================
diff -u -r7066faf667d6416689868171a2bdc3ae92929d62 -r93c5c784edfb6a81a937b8e56908c4c505441c3c
--- dialin/hd/hd_events.py	(.../hd_events.py)	(revision 7066faf667d6416689868171a2bdc3ae92929d62)
+++ dialin/hd/hd_events.py	(.../hd_events.py)	(revision 93c5c784edfb6a81a937b8e56908c4c505441c3c)
@@ -47,7 +47,7 @@
         self._hd_event_dictionary = dict()
         self._hd_event_data_type = dict()
 
-        # Dictionary of the the mode as key and the sub mode states enum class as the value
+        # Dictionary of the mode as key and the sub mode states enum class as the value
         self._hd_op_mode_2_sub_mode = {HDOpModes.MODE_FAUL.name: HDFaultStates,
                                        HDOpModes.MODE_INIT.name: HDInitStates,
                                        HDOpModes.MODE_STAN.name: HDStandbyStates,