Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
===================================================================
diff -u -rfdddcd8b25b5acc99f8c044c998af0e95752063c -r660cad5ccb0fb2ad30703cb1cf33db1ea243d156
--- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml	(.../PostTreatmentStack.qml)	(revision fdddcd8b25b5acc99f8c044c998af0e95752063c)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml	(.../PostTreatmentStack.qml)	(revision 660cad5ccb0fb2ad30703cb1cf33db1ea243d156)
@@ -44,9 +44,8 @@
         qsTr("Disinfection" ),
     ]
 
-             property int stackStepIndex    : 0
+    property int stackStepIndex : 0
     readonly property bool isDisconnect     : _root.stackStepIndex === PostTreatmentStack.StackStep.Disconnect
-    readonly property bool isReview         : _root.stackStepIndex === PostTreatmentStack.StackStep.Review
 
     onVisibleChanged: {
         if (visible) {
@@ -172,33 +171,6 @@
         onBackClicked   : _root.backClicked()
         onConfirmClicked: _root.confirmClicked()
 
-        Row { id: _qrRow
-            spacing         : Variables.defaultMargin
-            visible         :    _root.isReview
-
-            anchors {
-                left        : _titleBar.left
-                leftMargin  : Variables.defaultMargin * 2
-                top         : _titleBar.top
-                topMargin   : Variables.defaultMargin * 2
-            }
-
-            QRCode { id: _qrCode
-                anchors.verticalCenter      : parent.verticalCenter
-                anchors.verticalCenterOffset: -5
-                qrcode          : vPostTreatmentAdjustmentTreatmentLog.txCode
-                clear           : ! _root.visible
-            }
-
-            Text { id: _txCodeText
-                anchors.bottom  : _qrCode.bottom
-                text            : vPostTreatmentAdjustmentTreatmentLog.txCode ? qsTr("Tx Code: ") + vPostTreatmentAdjustmentTreatmentLog.txCode : " "
-                color           : "#DBE9FA"
-                font.pixelSize  : Fonts.fontPixelButton
-            }
-        }
-    }
-
     PostTreatmentDisconnectStack { id: _postTreatmentDisconnectStack
         objectName          : "_postTreatmentDisconnectStack"
         onVisibleChanged    :  if (visible) { stackStepIndex = PostTreatmentStack.Disconnect;   initStack()     }
@@ -221,6 +193,12 @@
         onVisibleChanged    :  if (visible) { stackStepIndex = PostTreatmentStack.Disinfection                  }
     }
 
+    PostTreatmentBase { id: _disposablesRemovalConfirm
+        objectName          :"_disposablesRemovalConfirm"
+        instructionBased    : true
+        onVisibleChanged    :  if (visible) { stackStepIndex = PostTreatmentStack.Disinfection }
+    }
+
     // connections
     Connections { target: vPostTreatmentStates
         function onDrainReservoirsChanged       ( vValue ) { console.debug("drainReservoirs     ", vValue   )}
@@ -256,7 +234,7 @@
         function onAdjustmentTriggered          ( vValue ) {
             if ( vPostTreatmentAdjustmentDisposablesRemovalConfirm.adjustment_Accepted ) {
                 _postTreatmentRemove.reasonText = ""
-                page(  _postTreatmentReview )
+                page( _postTreatmentReview )
             } else {
                 _postTreatmentRemove.reasonText = vPostTreatmentAdjustmentDisposablesRemovalConfirm.text()
             }