Index: sources/gui/qml/main.qml
===================================================================
diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -rcc7aae88f15228ff37b840946818692e444718bf
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 40ddf63592b60608ae34aeb3099fe4e62ae45054)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision cc7aae88f15228ff37b840946818692e444718bf)
@@ -182,7 +182,6 @@
                 vTreatmentCreate.txCode = ""
                 vTreatmentCreate.parametersValidated = false
                 vTreatmentCreate.parametersConfirmed = false
-                vTreatmentCreate.doClear()
             }
         }
     }
Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -rcc7aae88f15228ff37b840946818692e444718bf
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 40ddf63592b60608ae34aeb3099fe4e62ae45054)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision cc7aae88f15228ff37b840946818692e444718bf)
@@ -134,6 +134,7 @@
         }
 
         function onHomeChanged                  ( vValue ) { page( _startupScreen                   , vValue    )}
+        function onStandbyChanged               ( vValue ) { if ( vTDOpMode.standby ) _preTreatmentCreateStack.clear(vValue)        }
         function onStandbyStartChanged          ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }
         function onStandbyWaitTreatmentChanged  ( vValue ) { if ( vValue ) vDisinfectAdjustDisinfect.hasCancel  = false             }
         function onStandbyWaitDisinfectChanged  ( vValue ) { page( _disinfectStack                  , vValue    )}
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -rcc7aae88f15228ff37b840946818692e444718bf
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 40ddf63592b60608ae34aeb3099fe4e62ae45054)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision cc7aae88f15228ff37b840946818692e444718bf)
@@ -39,6 +39,8 @@
                                                                      _preTreatmentCreateContent.validate()
     onBackClicked           : vPreTreatmentAdjustmentInitTreatment.doCancel()
 
+    function clear( vValue ) { if ( ! vValue ) return;  _preTreatmentCreateContent.clear()  }
+
     PreTreatmentCreateContent { id: _preTreatmentCreateContent
         anchors {
             top         : _root.header.bottom
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r10d95daf091fedda008906727088648f66ae5bac -rcc7aae88f15228ff37b840946818692e444718bf
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 10d95daf091fedda008906727088648f66ae5bac)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision cc7aae88f15228ff37b840946818692e444718bf)
@@ -140,8 +140,6 @@
             activateAndRefresh() // refresh values on validation
             clearErrors()
         }
-
-        function onDidClear()   { _root.clear() }
     }
 
     Connections {  target: _acidConcentrateAdjustment
@@ -196,7 +194,7 @@
 
             if      ( selectedItem === _root.editRx     )   { /*All parameters set to edit if parameters are validated */   }
             else if ( selectedItem === _root.selectRx   )   { print("TODO: Open and Select from Prescription Manager")      }
-            else if ( selectedItem === _root.clearAll   )   { vTreatmentCreate.doClear()                                    }
+            else if ( selectedItem === _root.clearAll   )   { _root.clear()                                                 }
             else                                            {  /*Unknown state */                                           }
         }
     }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
===================================================================
diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -rcc7aae88f15228ff37b840946818692e444718bf
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision 40ddf63592b60608ae34aeb3099fe4e62ae45054)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision cc7aae88f15228ff37b840946818692e444718bf)
@@ -32,6 +32,8 @@
 
     property int stackStepIndex : 0
 
+    function clear(vValue) { if ( ! vValue ) return;  _pretreatmentCreate.clear(vValue) }
+
     PreTreatmentCreate          { id:       _pretreatmentCreate }
 
     onVisibleChanged: {
Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -r9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d -rcc7aae88f15228ff37b840946818692e444718bf
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision cc7aae88f15228ff37b840946818692e444718bf)
@@ -144,14 +144,6 @@
     }
 }
 
-/**
- * \brief VCreateTreatment::doClear
- *  Notify UI to clear fields
- */
-void VTreatmentCreate::doClear() {
-    emit didClear();
-}
-
 /*!
  * \brief   VTreatmentCreate::onActionReceive
  * \details This message is received from the HD in POST through the applicationController and GuiController.
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r10d95daf091fedda008906727088648f66ae5bac -rcc7aae88f15228ff37b840946818692e444718bf
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 10d95daf091fedda008906727088648f66ae5bac)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision cc7aae88f15228ff37b840946818692e444718bf)
@@ -139,13 +139,11 @@
     void didAdjustment(const AdjustParametersConfirmRequestData    &data);
 
     void didValidationPass  ();
-    void didClear           ();
 
 public slots:
     void doValidation   ();
     void doConfirm      ();
     void doCancel       ();
-    void doClear        ();
 
     QStringList doGetPrescriptionParameterValues();
     QStringList doGetOperatingParameterValues();