Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r48e5e7c2c365b44c9831f3af0b4f321862ea12ae -rdcd956fa52aef8f27bba867e54f764bebd384c99
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 48e5e7c2c365b44c9831f3af0b4f321862ea12ae)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision dcd956fa52aef8f27bba867e54f764bebd384c99)
@@ -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();
             }
@@ -358,7 +358,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;
     }
@@ -550,7 +550,7 @@
 
 #ifndef SKIP_SAMPLE_WATER
     if ( ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() ) /*||
-         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )*/ ) // DEBUG_DENALI
+         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )*/ )
 #endif
     {
         cmdDGSampleWater( SAMPLE_WATER_CMD_END );
@@ -655,7 +655,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;
     }
@@ -774,7 +774,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;
     }