Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h	(.../VDisinfectAdjustDisinfect.h)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h	(.../VDisinfectAdjustDisinfect.h)	(revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba)
@@ -19,9 +19,7 @@
 // Project
 #include "main.h" // Doxygen : do not remove
 #include "VAdjustmentResponseBase.h"
-#include "MDisinfectAdjustModeRequests.h"
 #include "MDisinfectAdjustStartRequests.h"
-#include "MDisinfectAdjustModeResponse.h"
 #include "MDisinfectAdjustStartResponse.h"
 
 namespace View {
@@ -41,41 +39,20 @@
     friend class ::tst_views;
 
     AdjustDisinfectStartRequestData _data;
+    TRIGGER( bool           , adjustment        , 0 )
 
-    TRIGGER ( bool       , adjustment_DisinfectMode            , 0)
-    TRIGGER ( bool       , adjustment_DisinfectStartFlush      , 0)
-    TRIGGER ( bool       , adjustment_DisinfectStartHeatActive , 0)
-    TRIGGER ( bool       , adjustment_DisinfectStartChemical   , 0)
-    TRIGGER ( bool       , adjustment_DisinfectStartChemFlush  , 0)
-    TRIGGER ( bool       , adjustment_DisinfectStartROPermeate , 0)
-    TRIGGER ( bool       , adjustment_DisinfectStartHeatPassive, 0)
-
-    PROPERTY( bool      , hasCancel     , 0)
-
     VIEW_DEC_CLASS(VDisinfectAdjustDisinfect)
-    VIEW_DEC_SLOT(AdjustDisinfectModeResponseData)
     VIEW_DEC_SLOT(AdjustDisinfectStartResponseData)
 
 public slots:
-    void    doDisinfectInitiate        ();
-    void    doDisinfectCancel          ();
 
-    void    doDisinfectClear           ();
-    void    doDisinfectFlush           ();
-    void    doDisinfectHeatActiveCool  ();
-    void    doDisinfectChemical        ();
-    void    doDisinfectChemFlush       ();
-    void    doDisinfectROPermeate      ();
-    void    doDisinfectConfirm         ();
-    void    doDisinfectHeatPassiveCool ();
+    void    doSkip              ();
+    void    doFlush             ();
+    void    doHeat              ();
+    void    doHeatCitric        ();
+    void    doSubstitutionPort  ();
 
 signals:
-    /*!
-     * \brief   didAdjustment
-     * \details the notification signal to send the user's Disinfect Mode Request
-     * \param   vData - data model includes request information
-     */
-    void     didAdjustment(const AdjustDisinfectModeRequestData  &vData);
 
     /*!
      * \brief   didAdjustment