Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r9bf209fc5813b7e806f51f408ece77174a336c9b -rfe91ec494378a7df34e3c14853a797f9f8f044e9
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9bf209fc5813b7e806f51f408ece77174a336c9b)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision fe91ec494378a7df34e3c14853a797f9f8f044e9)
@@ -91,7 +91,6 @@
 static void resetSignalFlags( void );
 static void transitionToCartridgeInstallation( void );
 static void transitionToPatientConnection( void );
-static void verifySwitchStatus( void );
 
 static HD_PRE_TREATMENT_MODE_STATE_T handleWaterSampleState( void );
 static HD_PRE_TREATMENT_MODE_STATE_T handleSelfTestConsumableState( void );
@@ -265,31 +264,6 @@
 
 /*********************************************************************//**
  * @brief
- * The verifySwitchStatus function checks Pump Track and Door switches are closed.
- * Verify Syringe is installed if needed.
- * Alarm is set if not.  Alarms cleared by driver executives.
- * @details Inputs: none
- * @details Outputs: Alarm
- * @return none
- *************************************************************************/
-static void verifySwitchStatus( void )
-{
-    F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32 hepRate  = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
-
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-       if ( ( FALSE == isSyringeDetected() ) && ( ( bolusVol > NEARLY_ZERO ) && ( hepRate > NEARLY_ZERO ) ) )
-       {
-           activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED );
-       }
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The signalUserConfirmInstallation function handles user confirmation of
  * disposable installation.
  * @details Inputs: none
@@ -322,6 +296,10 @@
                     // Everything is properly installed
                     accepted = TRUE;
                     confirmInstallRequested = TRUE;
+                    if ( ( bolusVol > NEARLY_ZERO ) || ( hepRate > NEARLY_ZERO ) )
+                    {
+                        syringeDetectionRequired( TRUE );
+                    }
                 }
                 else
                 {
@@ -711,14 +689,6 @@
             transitionToCartridgeInstallation();
         }
     }
-    else
-    {
-        if ( ( NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE <= getNoCartSelfTestsState() ) &&
-             ( NO_CART_SELF_TESTS_STOPPED_STATE != getNoCartSelfTestsState() ) )
-        {
-            verifySwitchStatus();
-        }
-    }
 
     return state;
 }
@@ -780,14 +750,6 @@
             transitionToPrime();
         }
     }
-    else
-    {
-        if ( ( DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE <= getDrySelfTestsState() ) &&
-             ( DRY_SELF_TESTS_STOPPED_STATE != getDrySelfTestsState() ) )
-        {
-            verifySwitchStatus();
-        }
-    }
 
     return state;
 }
@@ -822,13 +784,6 @@
             transitionToPreTreatmentRecirc();
         }
     }
-    else
-    {
-        if ( ( HD_PRIME_PAUSE != getPrimeState() ) )
-        {
-            verifySwitchStatus();
-        }
-    }
 
     return state;
 }
@@ -853,11 +808,6 @@
 
     execPreTreatmentRecirc();
 
-    if ( PRE_TREATMENT_RECIRC_STOPPED_STATE != getPreTreatmentRecircState() )
-    {
-        verifySwitchStatus();
-    }
-
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {