Index: sources/view/hd/data/VHDOperationModeData.cpp
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1da89b0452b8ef9448847618e75c118f3f58bd0c
--- sources/view/hd/data/VHDOperationModeData.cpp	(.../VHDOperationModeData.cpp)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/view/hd/data/VHDOperationModeData.cpp	(.../VHDOperationModeData.cpp)	(revision 1da89b0452b8ef9448847618e75c118f3f58bd0c)
@@ -38,19 +38,6 @@
     standbyStart                ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_START_STATE                           );
     standbyWaitTreatment        ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_WAIT_FOR_TREATMENT_STATE              );
     standbyWaitDisinfect        ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_WAIT_FOR_DISINFECT_STATE              );
-
-    // disinfection sub-states
-    standbyDGDisinfectFlushWaitResponse     ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE          );
-    standbyDGDisinfectFlushWaitStart        ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE              );
-    standbyDGDisinfectFlushInProgress       ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_DG_FLUSH_IN_PROGRESS_STATE                    );
-
-    standbyDGDisinfectHeatWaitResponse      ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE );
-    standbyDGDisinfectHeatWaitStart         ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE     );
-    standbyDGDisinfectHeatInProgress        ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE           );
-
-    standbyDGDisinfectChemicalWaitResponse  ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE );
-    standbyDGDisinfectChemicalWaitStart     ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE     );
-    standbyDGDisinfectChemicalInProgress    ( vData.mSubMode == GuiHDStandbyStates  ::STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE           );
     }
 
     // isTreatment ( ! _service ); //  if enabled goes to home, fault from service, which shouldn't since the service is dead end. Maybe later investigate more when fault enabled.
@@ -76,11 +63,8 @@
     // Brief : *** So actually we have a mixed condition property ***
     home ( _standby &&
            (                                                        // op_mode of standby is a must for the home screen
-                ( _standbyStart || _standbyWaitTreatment )  ||      // actual standby and ready to start a treatment
+                ( _standbyStart || _standbyWaitTreatment )          // actual standby and ready to start a treatment
                                                                     // disinfection state but getting to home screen to do what allowed in disinfection
-                ( _standbyDGDisinfectFlushWaitResponse      || _standbyDGDisinfectFlushWaitStart    || _standbyDGDisinfectFlushInProgress       ) ||
-                ( _standbyDGDisinfectHeatWaitResponse       || _standbyDGDisinfectHeatWaitStart     || _standbyDGDisinfectHeatInProgress        ) ||
-                ( _standbyDGDisinfectChemicalWaitResponse   || _standbyDGDisinfectChemicalWaitStart || _standbyDGDisinfectChemicalInProgress    )
             )
          );
 }