Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3db5538afb80bc12822304d698343e0325fa708e)
@@ -189,7 +189,9 @@
     switch ( currentPreTreatmentState )
     {
         case HD_PRE_TREATMENT_START_STATE:
+#ifndef _RELEASE_
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
+#endif
             {
                 transitionToSampleWater();
             }
@@ -346,10 +348,12 @@
     BOOL accepted = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM;
 
+#ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         patientConnectionConfirm = TRUE;
     }
+#endif
 
     if ( TRUE == patientConnectionConfirm )
     {
@@ -536,29 +540,33 @@
     execSampleWater();
 
 #ifndef SKIP_SAMPLE_WATER
-    if ( ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() ) ||
-         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) ) )
+    if ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() )
 #endif
     {
-        cmdDGSampleWater( SAMPLE_WATER_CMD_END );
-
-        if ( SELF_TEST_STATUS_PASSED == getSampleWaterResult() )
+#ifndef _RELEASE_
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
+#endif
         {
-            if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
+            cmdDGSampleWater( SAMPLE_WATER_CMD_END );
+
+            if ( SELF_TEST_STATUS_PASSED == getSampleWaterResult() )
             {
-                state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
-                cmdStartDG();
-                transitionToConsumableSelfTest();
+                if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
+                {
+                    state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
+                    cmdStartDG();
+                    transitionToConsumableSelfTest();
+                }
+                else
+                {
+                    cmdStopDG();
+                }
             }
             else
             {
-                cmdStopDG();
+                requestNewOperationMode( MODE_STAN );
             }
         }
-        else
-        {
-            requestNewOperationMode( MODE_STAN );
-        }
     }
 
     return state;
@@ -641,10 +649,12 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_CART_INSTALL_STATE;
 
+#ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         confirmInstallRequested = TRUE;
     }
+#endif
 
     if ( TRUE == confirmInstallRequested )
     {
@@ -757,10 +767,12 @@
 
     execPreTreatmentRecirc();
 
+#ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         continueToTreatmentRequested = TRUE;
     }
+#endif
 
     if ( TRUE == continueToTreatmentRequested )
     {
@@ -952,21 +964,25 @@
             {
                 U32 volume = FILL_RESERVOIR_TO_VOLUME_ML;
 
+#ifndef _RELEASE_
                 if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
                 {
                     volume = PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML;
                 }
+#endif
 
                 cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
             }
             else
             {
                 U32 volume = FILL_RESERVOIR_TO_VOLUME_ML;
 
+#ifndef _RELEASE_
                 if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
                 {
                     volume = PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML;
                 }
+#endif
 
                 cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
             }
@@ -975,10 +991,12 @@
         {
             U32 volume = FILL_RESERVOIR_TO_VOLUME_ML;
 
+#ifndef _RELEASE_
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
             {
                 volume = PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML;
             }
+#endif
 
             cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
         }
@@ -1051,11 +1069,13 @@
 
             if ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] )
             {
+#ifndef _RELEASE_
                 if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
                 {
                     reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
                 }
                 else
+#endif
                 {
                     reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
                     cmdSetDGActiveReservoir( DG_RESERVOIR_1 );