Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r1da58fd367887517d8bd1bfbee1b3033f08fe634 -ree458e1f570438f4ed48612cd5492a97be968274
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 1da58fd367887517d8bd1bfbee1b3033f08fe634)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision ee458e1f570438f4ed48612cd5492a97be968274)
@@ -487,24 +487,12 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) == SW_CONFIG_ENABLE_VALUE )
+    if ( ( isSyringePumpHome() != TRUE ) && ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
     {
-        heparinDeliveryState = HEPARIN_STATE_STOPPED;
+        heparinDeliveryState        = HEPARIN_STATE_STOPPED;
+        syringePumpSetRate          = SYRINGE_PUMP_RETRACT_RATE;
+        syringePumpRetractRequested = TRUE;
     }
-#endif
-    if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
-    {
-        heparinDeliveryState = HEPARIN_STATE_STOPPED;
-    }
-    if ( ( isSyringePumpHome() != TRUE ) && ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
-    {
-        {
-            heparinDeliveryState        = HEPARIN_STATE_STOPPED;
-            syringePumpSetRate          = SYRINGE_PUMP_RETRACT_RATE;
-            syringePumpRetractRequested = TRUE;
-        }
-    }
 
     return syringePumpRetractRequested;
 }