Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rdc857e4edb58df50f07bf3509e418a3b892586ae -r90d3a2eb18cc8282c0c68a23e39677327448781a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision dc857e4edb58df50f07bf3509e418a3b892586ae)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
@@ -199,7 +199,7 @@
     {
         case HD_PRE_TREATMENT_START_STATE:
 #ifndef SKIP_SAMPLE_WATER
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
+            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
             {
                 transitionToSampleWater();
             }
@@ -357,7 +357,7 @@
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM;
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
     {
         patientConnectionConfirm = TRUE;
     }
@@ -654,7 +654,7 @@
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_CART_INSTALL_STATE;
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
     {
         confirmInstallRequested = TRUE;
     }
@@ -773,7 +773,7 @@
     execPreTreatmentRecirc();
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
     {
         continueToTreatmentRequested = TRUE;
     }