Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r1132f049e169cc87a059261f72fca0ceb7d739f1 -r4fd94e57fbbdb54c779f28ef50f0997e8eefee5f
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 1132f049e169cc87a059261f72fca0ceb7d739f1)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 4fd94e57fbbdb54c779f28ef50f0997e8eefee5f)
@@ -24,7 +24,6 @@
 import "qrc:/pages/pretreatment"
 import "qrc:/pages/pretreatment/create"
 import "qrc:/pages/treatment"
-import "qrc:/pages/endtreatment"
 import "qrc:/pages/posttreatment"
 
 /*!
@@ -41,25 +40,16 @@
 
     property var currentScreen: stackView.currentItem
 
-    signal isCreateRx(bool vState) // pass upstream to HeaderBar
-
     stackView.initialItem   : _root.initialItem
 
     // Standby / Disinfection
     DisinfectStack                  { id: _disinfectStack                   }
     // Pre Treatment
-    PreTreatmentStack               { id: _preTreatmentStack
-        onIsCreateRxChanged     : _root.isCreateRx(_preTreatmentStack.isCreateRx)
-    }
+    PreTreatmentStack               { id: _preTreatmentStack                }
+
     // In TreatmentStack
     TreatmentStack                  { id: _treatmentStack                   }
 
-    // End Treatment
-    EndTreatmentRinsebackStack      { id: _endTreatmentRinsebackStack       }
-    EndTreatmentRecirculateStack    { id: _endTreatmentRecirculateStack     }
-    EndTreatmentEndStack            { id: _endTreatmentEndStack             }
-
-
     // Post Treatment
     PostTreatmentStack              { id: _postTreatmentStack               }
 
@@ -68,65 +58,13 @@
         onVisibleChanged: if (visible) _mainMenu.hidden = true
     }
 
-    ScreenItem { id: _postModeScreen
-        onVisibleChanged: if (visible) _mainMenu.hidden = true
-        Image { id: _dialityLogo
-            Behavior on opacity { OpacityAnimator { duration: 1000 } }
-            opacity         : _postModeScreen.visible ? 1 : 0
-            anchors.centerIn: parent
-            anchors.verticalCenterOffset: Variables.notificationHeight * -1
-            source          : "qrc:/images/iLogoDiality"
-        }
+    MainInitialization              { id: _postModeScreen                   }
 
-        ProgressBar {
-            minimum : 0
-            maximum : vHDPOSTData.itemCount
-            value   : _GuiView.useLogUnhandledOnly ? maximum : vHDPOSTData.itemIndex
-            width   : _dialityLogo.width    + 50
-            height  : 3
-            progress.border.width: 0
-            border.width: 0
-            minText .visible: false
-            maxText .visible: false
-            marker  .visible: false
-            anchors {
-                top: _dialityLogo.bottom
-                topMargin       : 15
-                horizontalCenter: parent.horizontalCenter
-            }
-            color : _GuiView.useLogUnhandledOnly ? "red": Colors.highlightProgressBar
-        }
-
-        WaitDone { id: _hdWaitdone
-            diameter: 100
-            anchors {
-                top: _dialityLogo.bottom
-                topMargin: 100
-                horizontalCenter: parent.horizontalCenter
-            }
-            visible : true
-            // HD will pause for a few seconds before changing to stand-by mode
-            // So we can show that POST has completed
-            fail    : ! vHDPOSTData.doneResult
-            done    :   vHDPOSTData.done
-            pause   : ! _postModeScreen.visible
-        }
-    }
-
-    MainHome                            { id: _mainHome
+    MainHome                        { id: _mainHome
         onCreateTreatment: function (vValue) {
             vTreatmentCreate.treatmentModality = vValue
             vPreTreatmentAdjustmentInitTreatment.doInitiate(                    )
         }
-
-        onVisibleChanged: {
-            if (visible) {
-                _mainMenu.hidden = false // initially our landing screen is _initialModeScreen which should not have the Main menu.
-            }
-            else {
-                _mainHome.reasonText = ""
-            }
-        }
     }
 
     Connections { target: vTDOpMode
@@ -137,7 +75,7 @@
         function onFaultChanged                 ( vValue ) { page( _startupScreen                   , vValue    )}
         function onServiceChanged               ( vValue ) { page( _startupScreen                   , vValue    )}
         function onInitChanged                  ( vValue ) { page( _postModeScreen                  , vValue    )
-                                                             if( vValue ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run
+                                                             if( vValue ) { vHDPOSTData.reset()                 } // better to reset on vinit = true because the rest makes the screen animation to run
         }
 
         function onHomeChanged                  ( vValue ) { page( _startupScreen                   , vValue    )}
@@ -163,9 +101,6 @@
         // in-Treatmet
         function onTxDialysisChanged            ( vValue ) { page( _treatmentStack                  , vValue    )}
 
-        function onTxRinsebackChanged           ( vValue ) { page( _endTreatmentRinsebackStack      , vValue    )}
-        function onTxRecirculateChanged         ( vValue ) { page( _endTreatmentRecirculateStack    , vValue    )}
-
         // Treatment Stop
         function onTxStopChanged                ( vValue ) { page( _treatmentStack                  , vValue    )}
         function onTsRecirculateChanged         ( vValue ) { page( null                             , vValue    )}