Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -ra7aab61ca63538c37b6931c60252680fc2ec2416 -ref583f0056a0fb8c66a64e132be159719b2bc2f6
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision a7aab61ca63538c37b6931c60252680fc2ec2416)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -36,9 +36,7 @@
         SelfTests       ,
         Saline          ,
         Prime           ,
-        WaterSample     ,
         CreateRx        ,
-        DialysateUF     ,
         Connect
     }
 
@@ -48,9 +46,6 @@
     readonly property bool isInstall    : stepKeys[_root.stackStepIndex] === PreTreatmentStack.Step.Installation
     readonly property bool isCreateRx   : stepKeys[_root.stackStepIndex] === PreTreatmentStack.Step.CreateRx
 
-    // TODO testing defeature... update later
-    property bool enableWaterSample     : true
-
     onVisibleChanged: {
         if (visible) {
             rebuildMap()
@@ -87,18 +82,9 @@
         keys.push(PreTreatmentStack.Step.Prime)
         values.push(qsTr("Prime"))
 
-        // TODO update to defeature later.. testing for science 🧪🔬
-        if (_root.enableWaterSample) {
-            keys.push(PreTreatmentStack.Step.WaterSample)
-            values.push(qsTr("Water Sample"))
-        }
-
         keys.push(PreTreatmentStack.Step.CreateRx)
         values.push(qsTr("Rx"))
 
-        keys.push(PreTreatmentStack.Step.DialysateUF)
-        values.push(qsTr("UF/Dialysate"))
-
         keys.push(PreTreatmentStack.Step.Connect)
         values.push(qsTr("Connect"))
 
@@ -119,7 +105,6 @@
         case PreTreatmentStack.Step.Installation:
             if ( vSettings.advancedMode )   { vPreTreatmentAdjustmentDisposablesConfirm.doConfirm() }
             else                            { _pretreatmentInstallation.continueClicked()           }
-
             break
         case PreTreatmentStack.Step.SelfTests:
             page ( _pretreatmentSaline )
@@ -129,22 +114,12 @@
             break
         case PreTreatmentStack.Step.Prime:
             if ( _pretreatmentPrime.timeCircleProgressValue === 0 ) { vPreTreatmentAdjustmentDisposablesPrime.doPrime();        }
-
-            if ( enableWaterSample )    { page ( _pretreatmentWaterSample ) }
-            else                        { page ( _pretreatmentCreate )      }
+            page ( _pretreatmentCreate )
             break
-        case PreTreatmentStack.Step.WaterSample:
-            vPreTreatmentAdjustmentWaterSample.doResult( _pretreatmentWaterSample.result          )
-            page ( _pretreatmentCreate )  // TODO remove when implementing messaging
-            break
         case PreTreatmentStack.Step.CreateRx:
             _pretreatmentCreate.confirmButtonClicked()
-            if ( vTreatmentCreate.parametersValidated ) { page ( _pretreatmentDialysateUf ) }
+            if ( vTreatmentCreate.parametersValidated ) { page ( _pretreatmentConnect ) }
             break
-        case PreTreatmentStack.Step.DialysateUF:
-            vPreTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentDialysateUf.ufVolume)
-            page ( _pretreatmentConnect )  // TODO remove when implementing messaging
-            break
         case PreTreatmentStack.Step.Connect:
             vPreTreatmentAdjustmentStartTreatment.doStart()
             break
@@ -201,8 +176,6 @@
 //            return _pretreatmentSelfTests.isComplete
 //        case PreTreatmentStack.Step.Prime:
 //            return _pretreatmentPrime.isComplete
-        case PreTreatmentStack.Step.WaterSample:
-            return _pretreatmentWaterSample.confirmEnabled
         case PreTreatmentStack.Step.CreateRx:
             return _pretreatmentCreate.confirmReady()
         default:
@@ -261,18 +234,10 @@
         onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Prime);                         }
     }
 
-    PreTreatmentWaterSample    { id:   _pretreatmentWaterSample
-        onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.WaterSample);                   }
-    }
-
     PreTreatmentCreate  { id:   _pretreatmentCreate
         onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.CreateRx)                       }
     }
 
-    PreTreatmentUltrafiltration { id:   _pretreatmentDialysateUf
-        onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.DialysateUF);                   }
-    }
-
     PreTreatmentBase    { id:   _pretreatmentConnect
         instructionBased    : true
         onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Connect);       updateModel()   }
@@ -302,34 +267,21 @@
         }
     }
 
-    // water sample
-    Connections { target: vPreTreatmentAdjustmentWaterSample
-        function onAdjustmentTriggered          ( vValue ) {
-            if ( vPreTreatmentAdjustmentWaterSample.adjustment_Accepted ) {
-                _pretreatmentWaterSample.reasonText = ""
-                page ( _pretreatmentCreate )
-            } else {
-                _pretreatmentWaterSample.reasonText = vPreTreatmentAdjustmentWaterSample.text()
-            }
-        }
-    }
+    // TODO - keep for now Ultrafiltration is beingn moved into Create Rx
+//    Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit
+//        function onAdjustmentTriggered          ( vValue ) {
+//            // the maximum ultrafiltration volume has to be set/revert regardless
+//            vTreatmentUltrafiltration.maximum   = vPreTreatmentAdjustmentUltrafiltrationInit.volume
 
-    // Ultrafiltration
-    Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit
-        function onAdjustmentTriggered          ( vValue ) {
-            // the maximum ultrafiltration volume has to be set/revert regardless
-            vTreatmentUltrafiltration.maximum   = vPreTreatmentAdjustmentUltrafiltrationInit.volume
+//            // but only if it has been accepted it will navigate
+//            if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) {
+//            }
+//            else {
+//                _pretreatmentDialysateUf.reasonText = vPreTreatmentAdjustmentUltrafiltrationInit.text()
+//            }
+//        }
+//    }
 
-            // but only if it has been accepted it will navigate
-            if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) {
-                page( _pretreatmentConnect )
-            }
-            else {
-                _pretreatmentDialysateUf.reasonText = vPreTreatmentAdjustmentUltrafiltrationInit.text()
-            }
-        }
-    }
-
     // start treatment
     Connections { target: vPreTreatmentAdjustmentStartTreatment
         function onAdjustmentTriggered          ( vValue ) {