Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rc8da2f1848da1dfb3ca1c4f2bb453a1f7d149b2e -re6e0e56ed9769723d5e4a561a9dfe4b16ad058e6
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision c8da2f1848da1dfb3ca1c4f2bb453a1f7d149b2e)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e6e0e56ed9769723d5e4a561a9dfe4b16ad058e6)
@@ -483,11 +483,14 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
-    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
-    {
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) == SW_CONFIG_ENABLE_VALUE )
+    if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) == SW_CONFIG_ENABLE_VALUE )
+    {
+        heparinDeliveryState = HEPARIN_STATE_OFF;
+    }
 #endif
+    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
+    {
         {
             heparinDeliveryState = HEPARIN_STATE_STOPPED;
             if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r3db5538afb80bc12822304d698343e0325fa708e -re6e0e56ed9769723d5e4a561a9dfe4b16ad058e6
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3db5538afb80bc12822304d698343e0325fa708e)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e6e0e56ed9769723d5e4a561a9dfe4b16ad058e6)
@@ -539,13 +539,8 @@
 
     execSampleWater();
 
-#ifndef SKIP_SAMPLE_WATER
     if ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() )
-#endif
     {
-#ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
-#endif
         {
             cmdDGSampleWater( SAMPLE_WATER_CMD_END );
 
Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r3db5538afb80bc12822304d698343e0325fa708e -re6e0e56ed9769723d5e4a561a9dfe4b16ad058e6
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 3db5538afb80bc12822304d698343e0325fa708e)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision e6e0e56ed9769723d5e4a561a9dfe4b16ad058e6)
@@ -87,22 +87,31 @@
 *************************************************************************/
 void execSampleWater( void )
 {
-    switch ( currentSampleWaterState )
+#ifndef _RELEASE_
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
     {
-        case SAMPLE_WATER_SETUP_STATE:
-            currentSampleWaterState = handleWaterSampleSetupState();
-            break;
+        currentSampleWaterState = SAMPLE_WATER_COMPLETE_STATE;
+    }
+    else
+#endif
+    {
+        switch ( currentSampleWaterState )
+        {
+            case SAMPLE_WATER_SETUP_STATE:
+                currentSampleWaterState = handleWaterSampleSetupState();
+                break;
 
-        case SAMPLE_WATER_STATE:
-            currentSampleWaterState = handleWaterSampleState();
-            break;
+            case SAMPLE_WATER_STATE:
+                currentSampleWaterState = handleWaterSampleState();
+                break;
 
-        case SAMPLE_WATER_COMPLETE_STATE:
-            break;
+            case SAMPLE_WATER_COMPLETE_STATE:
+                break;
 
-        default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_SAMPLE_WATER_INVALID_STATE, currentSampleWaterState );
-            break;
+            default:
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_SAMPLE_WATER_INVALID_STATE, currentSampleWaterState );
+                break;
+        }
     }
 }