Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r3702984c4572607055ab3ede4d45792e74595991
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 3702984c4572607055ab3ede4d45792e74595991)
@@ -22,9 +22,6 @@
 import "qrc:/pages/treatment/adjustments"
 import "qrc:/pages/pretreatment/create"
 import "qrc:/pages/posttreatment"
-import "qrc:/pages/posttreatment/rinseback"
-import "qrc:/pages/posttreatment/recirculate"
-import "qrc:/pages/posttreatment/end"
 
 /*!
  * \brief   TreatmentStack is the screen
@@ -67,6 +64,12 @@
         hasLogo         : true
     }
 
+    // Blood Prime
+    PostTreatmentBloodPrime         { id: _postTreatmentBloodPrime          } // only one page, no stack for now.
+    PostTreatmentRinsebackStack     { id: _postTreatmentRinsebackStack      }
+    PostTreatmentRecirculateStack   { id: _postTreatmentRecirculateStack    }
+    PostTreatmentEndStack           { id: _postTreatmentEndStack            }
+
     TreatmentHome               { id:       _treatmentHome
         onTreatmentStarted      : push( _treatmentStart )
         onTreatmentCreated      : vTreatmentCreate.doSelectParameters()
@@ -204,73 +207,8 @@
         }
     }
 
-    // Blood Prime
-    PostTreatmentBloodPrime         { id: _postTreatmentBloodPrime          }
-    // Rinseback
-    PostTreatmentRinsebackInit      { id: _postTreatmentRinsebackInit
-        onRinsebackClicked          : vTreatmentAdjustmentRinseback.doStart         () //82.0
-        onTreatmentEndClicked       : vTreatmentAdjustmentRinseback.doTreatmentEnd  () //82.8
-        onTreatmentBackClicked      : vTreatmentAdjustmentRinseback.doTreatmentBack () //82.9
-    }
-    PostTreatmentRinseback          { id: _postTreatmentRinseback
-        onAccelerateClicked         : vTreatmentAdjustmentRinseback.doIncrement     () //82.1
-        onDeccelerateClicked        : vTreatmentAdjustmentRinseback.doDecrement     () //82.2
-        onPauseClicked              : vTreatmentAdjustmentRinseback.doPause         () //82.3
-        onResumeClicked             : vTreatmentAdjustmentRinseback.doResume        () //82.4
-        onEndClicked                : vTreatmentAdjustmentRinseback.doEnd           () //82.5
-    }
-    PostTreatmentRinsebackComplete  { id: _postTreatmentRinsebackComplete
-        onAdditionalClicked         : vTreatmentAdjustmentRinseback.doAdditional    () //82.6
-        onConfirmClicked            : vTreatmentAdjustmentRinseback.doConfirm       () //82.7
-        onTreatmentEndClicked       : vTreatmentAdjustmentRinseback.doTreatmentEnd  () //82.8
-    }
-    PostTreatmentAdditional         { id: _postTreatmentAdditional          }
-    // Recirculate
-    PostTreatmentRecirculate        { id: _postTreatmentRecirculate
-        onReconnectClicked          : vTreatmentAdjustmentRecirculate.doReconnect   () //84.0
-        onTreatmentEndClicked       : vTreatmentAdjustmentRecirculate.doTreatmentEnd() //84.3
-    }
-    PostTreatmentReconnect          { id: _postTreatmentReconnect
-        onConfirmClicked            : vTreatmentAdjustmentRecirculate.doConfirm     () //84.1
-        onRecirculateBackClicked    : vTreatmentAdjustmentRecirculate.doResume      () //84.2
-    }
 
-    // Treatment Complete
-    PostTreatmentEnd                { id: _postTreatmentEnd
-        onRinsebackClicked          : vTreatmentAdjustmentEnd.doEnd                 () //87.0
-    }
-    PostTreatmentEndPaused          { id: _postTreatmentEndPaused           }
-
     // ---------- Manages Responses ----------
-    Connections { target: vTreatmentAdjustmentRinseback
-        onAdjustmentTriggered: {
-            // there is only one message to handle all the sub pages of rinseback
-            // since the rejection reason will be cleared by each trasition
-            // so it's fine to set all at the same time
-            // and let them cleared for their own message when each get visible.
-            _postTreatmentRinsebackInit     .reasonText = vTreatmentAdjustmentRinseback.text();
-            _postTreatmentRinseback         .reasonText = vTreatmentAdjustmentRinseback.text();
-            _postTreatmentRinsebackComplete .reasonText = vTreatmentAdjustmentRinseback.text();
-        }
-    }
-
-    Connections { target: vTreatmentAdjustmentRecirculate
-        onAdjustmentTriggered: {
-            // there is only one message to handle all the sub pages of rinseback
-            // since the rejection reason will be cleared by each trasition
-            // so it's fine to set all at the same time
-            // and let them cleared for their own message when each get visible.
-            _postTreatmentRecirculate   .reasonText = vTreatmentAdjustmentRecirculate.text();
-            _postTreatmentReconnect     .reasonText = vTreatmentAdjustmentRecirculate.text();
-        }
-    }
-
-    Connections { target: vTreatmentAdjustmentEnd
-        onAdjustmentTriggered: {
-            _postTreatmentEnd.reasonText = vTreatmentAdjustmentEnd.text();
-        }
-    }
-
     Connections { target: vTreatmentAdjustmentDuration
         onAdjustmentTriggered   : {
             if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) {
@@ -387,26 +325,10 @@
         // in-Treatmet
         onTxDialysisChanged     : { if ( vtxDialysis        ) { page( _treatmentStart                   )}}
 
-        // shall push the rinseback stack which hasn't been implemented yet.
-        // Rinseback
-        onTxRinsebackChanged    : { if ( vtxRinseback       ) { page( _postTreatmentRinsebackInit       )}}
-        onRbInitChanged         : { if ( vrbInit            ) { page( _postTreatmentRinsebackInit       )}}
-        onRbRunChanged          : { if ( vrbRun             ) { page( _postTreatmentRinseback           )}}
-        onRbPausedChanged       : { if ( vrbPaused          ) { page( _postTreatmentRinseback           )}}
-        onRbStopChanged         : { if ( vrbStop            ) { page( _postTreatmentRinsebackComplete   )}}
-        onRbAdditionalChanged   : { if ( vrbAdditional      ) { page( _postTreatmentAdditional          )}}
+        onTxRinsebackChanged    : { if ( vtxRinseback       ) { page( _postTreatmentRinsebackStack      )}}
+        onTxRecirculateChanged  : { if ( vtxRecirculate     ) { page( _postTreatmentRecirculateStack    )}}
+        onTxEndChanged          : { if ( vtxEnd             ) { page( _postTreatmentEndStack            )}}
 
-        // shall push the recirculate stack which hasn't been implemented yet.
-        // Recirculate
-        onTxRecirculateChanged  : { if ( vtxRecirculate     ) { page( _postTreatmentRecirculate         )}}
-        onRcStartedChanged      : { if ( vrcStarted         ) { page( _postTreatmentRecirculate         )}}
-        onRcStoppedChanged      : { if ( vrcStopped         ) { page( _postTreatmentReconnect           )}}
-
-        // Treatment End
-        onTxEndChanged          : { if ( vtxEnd             ) { page( _postTreatmentEnd                 )}}
-        onTeWaitRinsebackChanged: { if ( vteWaitRinseback   ) { page( _postTreatmentEnd                 )}}
-        onTePausedChanged       : { if ( vtePaused          ) { page( _postTreatmentEndPaused           )}}
-
         // Treatment Stop
         onTxStopChanged         : { if ( vtxStop            ) { page( _treatmentStart                   )}}
         onTsRecirculateChanged  : { if ( vtsRecirculate     ) { /* No action defined yet */              }}