Index: sources/view/hd/data/VHDOperationModeData.cpp
===================================================================
diff -u -r9bb832813fb65bcd633524ba16740dace5d529e5 -r338db0ec87e24176cf7ae55e7371f39c48ee93ee
--- sources/view/hd/data/VHDOperationModeData.cpp	(.../VHDOperationModeData.cpp)	(revision 9bb832813fb65bcd633524ba16740dace5d529e5)
+++ sources/view/hd/data/VHDOperationModeData.cpp	(.../VHDOperationModeData.cpp)	(revision 338db0ec87e24176cf7ae55e7371f39c48ee93ee)
@@ -63,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    )
             )
          );
 }
Index: sources/view/hd/data/VHDOperationModeData.h
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r338db0ec87e24176cf7ae55e7371f39c48ee93ee
--- sources/view/hd/data/VHDOperationModeData.h	(.../VHDOperationModeData.h)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/view/hd/data/VHDOperationModeData.h	(.../VHDOperationModeData.h)	(revision 338db0ec87e24176cf7ae55e7371f39c48ee93ee)
@@ -56,20 +56,6 @@
     PROPERTY( bool    , standbyWaitTreatment        , false ) ///< Wait for treatment                                , STANDBY_WAIT_FOR_TREATMENT_STATE
     PROPERTY( bool    , standbyWaitDisinfect        , false ) ///< Wait for disinfect                                , STANDBY_WAIT_FOR_DISINFECT_STATE
 
-    // disinfection sub-states
-    PROPERTY( bool    , standbyDGDisinfectFlushWaitResponse     , false ) ///< Wait for DG flush command response.                  , STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE,
-    PROPERTY( bool    , standbyDGDisinfectFlushWaitStart        , false ) ///< Wait for DG flush to start.                          , STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE,
-    PROPERTY( bool    , standbyDGDisinfectFlushInProgress       , false ) ///< DG flush operation is in progress                    , STANDBY_DG_FLUSH_IN_PROGRESS_STATE,
-
-    PROPERTY( bool    , standbyDGDisinfectHeatWaitResponse      , false ) ///< Wait for DG heat disinfect command response          , STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE,
-    PROPERTY( bool    , standbyDGDisinfectHeatWaitStart         , false ) ///< Wait for DG heat disinfect to start.                 , STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE,
-    PROPERTY( bool    , standbyDGDisinfectHeatInProgress        , false ) ///< DG heat disinfect operation is in progress.          , STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,
-
-    PROPERTY( bool    , standbyDGDisinfectChemicalWaitResponse  , false ) ///< Wait for DG chemical disinfect command response.     , STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE,
-    PROPERTY( bool    , standbyDGDisinfectChemicalWaitStart     , false ) ///< Wait for DG chemical disinfect to start.             , STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE,
-    PROPERTY( bool    , standbyDGDisinfectChemicalInProgress    , false ) ///< DG chemical disinfect operation is in progress       , STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,
-
-
     PROPERTY( bool    , home                        , false ) ///< Special Home mode // see in the cpp file.
 
     PROPERTY( bool    , isTreatment                 , false )