Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -rf416391a93d78ea154b43afd09a8764e2573fd9a
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision f416391a93d78ea154b43afd09a8764e2573fd9a)
@@ -280,11 +280,14 @@
     syringePumpVolumeStartPosition = 0;
     syringePumpHomePositionOffset = 0;
     syringePumpLastPosition = 0;
+
+#ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
     {
         syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
         syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
     }
+#endif
 
     syringePumpDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     syringePumpSpeedCalcTimerCounter = 0;
@@ -480,16 +483,19 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
-    if ( ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) ) ||
-           ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) ) == SW_CONFIG_ENABLE_VALUE )
+    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
     {
-        heparinDeliveryState = HEPARIN_STATE_STOPPED;
-        if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) == SW_CONFIG_ENABLE_VALUE )
+#endif
         {
-            syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
-            syringePumpRetractRequested = TRUE;
+            heparinDeliveryState = HEPARIN_STATE_STOPPED;
+            if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
+            {
+                syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
+                syringePumpRetractRequested = TRUE;
+            }
         }
-
     }
 
     return syringePumpRetractRequested;
@@ -571,7 +577,9 @@
     }
     else
     {
+#ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+#endif
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD, syringePumpSetRate )
         }
@@ -602,7 +610,9 @@
     }
     else
     {
+#ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+#endif
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_CONT_CMD, flowRate )
         }
@@ -945,7 +955,9 @@
     calcSafetyVolumeDelivered();
     // Calculate measured rate (mL/hr)
     calcMeasRate();
+#ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
         // Get measured direction
         syringePumpControllerMeasuredDirection = ( ( getSyringePumpEncoderStatus() & SYRINGE_PUMP_ENCODER_DIRECTION_BIT ) != 0 ? MOTOR_DIR_REVERSE : MOTOR_DIR_FORWARD );
@@ -969,7 +981,9 @@
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR,
                                                  ( ( getCurrentOperationMode() > MODE_INIT ) && ( lastSyringePumpADCReadCtr == getSyringePumpADCReadCounter() ) ) ) )
         {
+#ifndef _RELEASE_
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
             {
                 activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
             }
@@ -1114,11 +1128,15 @@
     SYRINGE_PUMP_STATE_T result = SYRINGE_PUMP_OFF_STATE;
 
     // Check position is not changing while stopped
-    if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, ( syringePumpLastPosition != getSyringePumpPosition() ) ) ) &&
-         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE ) )
+    if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, ( syringePumpLastPosition != getSyringePumpPosition() ) ) ) )
     {
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+        {
             activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR );
             activateSafetyShutdown();
+        }
     }
 
     // Check for request flags
@@ -1277,7 +1295,9 @@
         }
         else
         {
+#ifndef _RELEASE_
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
             {
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM, syringeVol, txVolume );
             }
@@ -1488,7 +1508,9 @@
 {
     BOOL result = stopPump;
 
+#ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, ( syringePumpEncoderMeasuredDirection != expDir ) ) )
         {
@@ -1628,7 +1650,9 @@
 {
     BOOL result = stopPump;
 
+#ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
         F32  rate = getSyringePumpMeasRate();
         F32  max = MAX( rate, syringePumpSetRate );