Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -181,11 +181,6 @@
     switch ( currentPrimeState )
     {
         case HD_PRIME_START_STATE:
-#ifdef SKIP_PRIMING
-            currentPrimeState = HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
-#else
-            //currentPrimeState = HD_PRIME_WAIT_FOR_USER_START_STATE;
-#endif
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
             {
                 currentPrimeState = HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
@@ -431,10 +426,6 @@
     // Keep updating start time until the user requested priming
     primeStartTime = getMSTimerCount();
 
-#ifdef SKIP_UI_INTERACTION
-    primeStartRequested = TRUE;
-#endif
-
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         primeStartRequested = TRUE;
@@ -590,11 +581,6 @@
             steadyVolumeSamplingStartTime = getMSTimerCount();
             primeDialysateDialyzerStartTime = getMSTimerCount();
 
-    #ifdef SKIP_PRIMING
-            state = HD_PRIME_WET_SELF_TESTS_STATE;
-    #else
-            //state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
-    #endif
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
             {
                 state = HD_PRIME_WET_SELF_TESTS_STATE;
@@ -846,11 +832,6 @@
         signalResumeSelfTests();
     }
 
-#ifndef SKIP_WET_SELF_TESTS
-    //execWetSelfTests();
-
-    //if ( TRUE == isWetSelfTestsPassed() )
-#endif
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
     {
         execWetSelfTests();