Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -221,7 +221,6 @@
     F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
     F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
-#ifndef DISABLE_SYRINGE_PUMP
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
     {
         useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
@@ -230,9 +229,7 @@
     {
         useHeparin = FALSE;
     }
-#else
-    useHeparin = FALSE;
-#endif
+
     currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_STATE;
     runPumpStartTime = 0;
     havePumpsStarted = FALSE;
@@ -385,12 +382,6 @@
     switch ( currentDrySelfTestsState )
     {
         case DRY_SELF_TESTS_START_STATE:
-#ifdef SKIP_DRY_SELF_TESTS
-            // TODO: Remove once dry self-test is ready to use
-            currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
-#else
-            //currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-#endif
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
             {
                 // TODO: Remove once dry self-test is ready to use
@@ -1047,11 +1038,6 @@
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
-#ifndef SKIP_DRY_SELF_TESTS
-        //state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-#else
-        state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
-#endif
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
         {
             state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;