Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
===================================================================
diff -u -r066258b65a1c41afe3828c92d2606d2642505d72 -r4afc91856c00e01dfb5d84bc54d2d92faefec0db
--- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml	(.../PostTreatmentStack.qml)	(revision 066258b65a1c41afe3828c92d2606d2642505d72)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml	(.../PostTreatmentStack.qml)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
@@ -32,10 +32,6 @@
     signal patientDisconnectionConfirm  ()
     signal treatmentReviewConfirm       ()
     signal disposablesRemovalConfirm    ()
-    signal disinfectionSkip             ()
-    signal disinfectionHeatClicked      ()
-    signal disinfectionChemicalClicked  ()
-    signal disinfectionChemicalTest     ()
 
     PostTreatmentBase { id: _patientDisconnectionConfirm
         property int stackStepIndex : 0
@@ -61,68 +57,20 @@
         onConfirmClicked        : _root.disposablesRemovalConfirm()
     }
 
-    PostTreatmentBase { id: _disinfection
-        property int stackStepIndex : 3
-        header.confirmVisible   : true
-        header.confirmText.text : qsTr("SKIP")
-        title.text              : qsTr("Disinfection")
-        footer.childrenWidth    : 350
-        footer.children: [
-            TouchRect {
-                text.text: qsTr("Heat Disinfection")
-                onClicked: _root.disinfectionHeatClicked()
-            },
-            TouchRect {
-                text.text: qsTr("Chemical Disinfection")
-                onClicked: _root.disinfectionChemicalClicked()
-            }
-        ]
-        onConfirmClicked        : _root.disinfectionSkip()
-    }
-
-    PostTreatmentBase { id: _disinfectionHeat
-        property int stackStepIndex : 3
-        title.text              : qsTr("Heat Disinfection")
-        hasTimeCircle           : true
-    }
-
-    PostTreatmentBase { id: _disinfectionChemicalInstruction
-        property int stackStepIndex : 3
-        header.confirmVisible   : true
-        title.text              : qsTr("Chemical Disinfection")
-        instructionBased        : true
-        onConfirmClicked        : _root.disinfectionChemicalTest()
-    }
-
-    PostTreatmentBase { id: _disinfectionChemicalProgress
-        property int stackStepIndex : 3
-        title.text              : qsTr("Chemical Disinfection")
-        hasTimeCircle           : true
-    }
-
-    PostTreatmentBase { id: _flush
-        property int stackStepIndex : 3
-        title.text              : qsTr("Flush")
-        hasTimeCircle           : true
-    }
-
     Connections { target: vPostTreatmentStates
-        onPatientDisconnectionChanged   : { console.debug("patientDisconnection", vpatientDisconnection )}
-        onDrainReservoirsChanged        : { console.debug("drainReservoirs     ", vdrainReservoirs      )}
-        onVerifyChanged                 : { console.debug("verify              ", vverify               )}
+        onPatientDisconnectionChanged       : { console.debug("patientDisconnection", vpatientDisconnection         )}
+        onDrainReservoirsChanged            : { console.debug("drainReservoirs     ", vdrainReservoirs              )}
+        onVerifyChanged                     : { console.debug("verify              ", vverify                       )}
     }
 
     Connections { target: vHDOperationMode
-        onPostTreatmentChanged          : { page( _patientDisconnectionConfirm  , vpostTreatment        )}
+        onPostTreatmentChanged              : { page( _patientDisconnectionConfirm  , vpostTreatment                )}
     }
 
-    onPatientDisconnectionConfirm       : { page( _treatmentReviewConfirm                               )}
-    onTreatmentReviewConfirm            : { page( _disposablesRemovalConfirm                            )}
-    onDisposablesRemovalConfirm         : { page( _disinfection                                         )}
-    onDisinfectionHeatClicked           : { page( _disinfectionHeat                                     )}
-    onDisinfectionChemicalClicked       : { page( _disinfectionChemicalInstruction                      )}
-    onDisinfectionChemicalTest          : { page( _disinfectionChemicalProgress                         )}
-    onDisinfectionSkip                  : { page( _flush                                                )}
+    onPatientDisconnectionConfirm           : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm(     )
+    /* No wait for Rsp, so navigates => */      page( _treatmentReviewConfirm                                       )}
+    onTreatmentReviewConfirm                : { page( _disposablesRemovalConfirm                                    )}
+    onDisposablesRemovalConfirm             : { vPostTreatmentAdjustmentDisposablesRemovalConfirm   .doConfirm(     )}
 
     onVisibleChanged: {
         if (visible) {