Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -rb34af342449705923783d041ec0fa468d1d30be2 -r44c45c64baa4ddcd94b0fda9ec5d735bb087caa9
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision b34af342449705923783d041ec0fa468d1d30be2)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 44c45c64baa4ddcd94b0fda9ec5d735bb087caa9)
@@ -74,59 +74,7 @@
         _flickable.contentY = vItem.mapToItem(_flickable.contentItem, 0, 0).y
     }
 
-    function clear() {
-        _bloodFlowRate          .clear()
-        _dialysateFlowRate      .clear()
-        _duration               .clear()
-        _heparinDispensingRate  .clear()
-        _heparinBolusVolume     .clear()
-        _heparinStopTime        .clear()
-        _salineBolus            .clear()
-        _heparinType            .clear()
-        _acidConcentrate        .clear()
-        _bicarbonateConcentrate .clear()
-        _dialyzerType           .clear()
-        _dialysateTemperature   .clear()
-        _bloodPressureInterval  .clear()
-    }
 
-    property bool prepopulated: false
-    function prepopulate() {
-        // not complete yet and not part of the current DNBUG
-        // the issue is the On/Off switches whcih has not been stored in the view to restore/prepopulate it,
-        // which is needed for three sliders to be set properly.
-        _bloodFlowRate          .reset(vTreatmentCreate.bloodFlowRate                   )
-        _dialysateFlowRate      .reset(vTreatmentCreate.dialysateFlowRate               )
-        _duration               .reset(vTreatmentCreate.treatmentDuration               )
-        _heparinDispensingRate  .reset(vTreatmentCreate.heparinDispensingRate           )
-        _heparinBolusVolume     .reset(vTreatmentCreate.heparinBolusVolume              )
-        _heparinStopTime        .reset(vTreatmentCreate.heparinStopTime                 )
-        _salineBolus            .reset(vTreatmentCreate.salineBolusVolume               )
-        _heparinType            .reset(vTreatmentCreate.heparinType                     )
-        _acidConcentrate        .reset(vTreatmentCreate.acidConcentrate                 )
-        _bicarbonateConcentrate .reset(vTreatmentCreate.bicarbonateConcentrate          )
-        _dialyzerType           .reset(vTreatmentCreate.heparinType                     )
-        _dialysateTemperature   .reset(vTreatmentCreate.dialysateTemp                   )
-        _bloodPressureInterval  .reset(vTreatmentCreate.bloodPressureMeasureInterval    )
-    }
-
-    ConfirmButton { id : _prepopulateButton
-        objectName          : "_prepopulateButton"
-        text.text           : prepopulated ? qsTr("RESET") : qsTr("PREPOPULATE")
-        anchors.top         : title.top
-        anchors.topMargin   : 0
-        visible             : false // true // not readu yet and has been hidded.
-        onClicked           : {
-            if ( prepopulated ) {
-                clear()
-            }
-            else {
-                prepopulate()
-            }
-            prepopulated = ! prepopulated
-        }
-    }
-
     ScrollBar {
         flickable   : _flickable
         anchors.fill: _flickable
@@ -268,7 +216,6 @@
                 //            ToDo: create a component for Switch,
                 //            ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property
                 //            This is a full implementation of a Switch
-                toggleSwich: _heparinDispensingRateSwitch
                 Switch { id: _heparinDispensingRateSwitch
                     property bool active: false
                     onCheckedChanged: {
@@ -348,7 +295,6 @@
                 //            ToDo: create a component for this,
                 //            ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property
                 //            This is a full implementation of a CheckBox
-                toggleSwich: _heparinBolusVolumeSwitch
                 Switch { id: _heparinBolusVolumeSwitch
                     property bool active: false
                     onCheckedChanged: {
@@ -462,7 +408,7 @@
                 onEnabledChanged: {
                     if ( ! enabled ) {
                         vTreatmentCreate.heparinTypeSet = false
-                        clear()
+                        reset()
                     }
                 }
 
@@ -803,7 +749,6 @@
                 //            ToDo: create a component for this,
                 //            ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property
                 //            This is a full implementation of a CheckBox
-                toggleSwich: _bloodPressureIntervalSwitch
                 Switch { id: _bloodPressureIntervalSwitch
                     property bool active: false
                     onCheckedChanged: {