Index: firmware/App/HDCommon.h
===================================================================
diff -u -r44a100f8e5210a02c23b8fcc4527d8e96d577381 -rbad0628d7a6484bfa8a550fd2a589f56d0a6c53d
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision bad0628d7a6484bfa8a550fd2a589f56d0a6c53d)
@@ -38,7 +38,7 @@
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
     #define DISABLE_ALARM_AUDIO             1           // Disable alarm audio
-//    #define SKIP_POST                       1           // Skip POST tests - all pass
+    #define SKIP_POST                       1           // Skip POST tests - all pass
 //    #define DONT_SKIP_NV_POST               1           // Do not skip NV Data POST
 //    #define USE_LIBRARY_TIME_FUNCTIONS      1           // Use the C library functions mktime() and gmtime() for epoch<=>date conversions
     #define DISABLE_AIR_TRAP_LEVELING_ALARM 1           // Disable air trap level control alarms
@@ -51,7 +51,7 @@
 //    #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
 //    #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
 //    #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
-//    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
+    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
 //    #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
@@ -64,23 +64,24 @@
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
     #define ALARM_VOLUME_DEFAULT_LOW        1           // Set default alarm volume to lowest
     #define TEMP_UI_ALARM_SILENCE_FIX       1           // Temporary UI fix for handling alarm silence request msg
-    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
-    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 //    #define V2_0_SYSTEM                     1           // Build for v2.0 system
-    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
-    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
-    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
-    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
     #define DISABLE_BATT_COMM               1           // Disable battery communication.
     #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
     #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
 //    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
-    #define SKIP_EMPTY_RES_CHECK            1           // Skip reservoir empty check
 //    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
 //    #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute
 //    #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 
+    // Skip Pre-Treatment and get to treatment as soon as possible
+//    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
+    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
+    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
+    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
+    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
+
     #include <stdio.h>
     #include <strings.h>
 #endif
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r6f2218c22e666aec059afbd60f3d0d268b305ad0 -rbad0628d7a6484bfa8a550fd2a589f56d0a6c53d
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 6f2218c22e666aec059afbd60f3d0d268b305ad0)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision bad0628d7a6484bfa8a550fd2a589f56d0a6c53d)
@@ -397,14 +397,6 @@
  *************************************************************************/
 static HD_POST_TREATMENT_STATE_T handlePostTreatmentVerifyState( void )
 {
-#ifndef SKIP_EMPTY_RES_CHECK
-    BOOL const isReservoirOneEmpty = fabs( getReservoirWeightLargeFilter( DG_RESERVOIR_1 ) ) <= LOAD_CELL_VOLUME_NOISE_TOLERANCE_GRAMS;
-    BOOL const isReservoirTwoEmpty = fabs( getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) ) <= LOAD_CELL_VOLUME_NOISE_TOLERANCE_GRAMS;
-#else
-    BOOL const isReservoirOneEmpty = TRUE;
-    BOOL const isReservoirTwoEmpty = TRUE;
-#endif
-
 #ifndef SKIP_CARTRIDGE_REMOVAL
     BOOL isCartridgeRemoved = isCartridgeUnloaded();
 #else
@@ -423,8 +415,7 @@
             activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
         }
 
-        if ( ( TRUE == isReservoirOneEmpty ) && ( TRUE == isReservoirTwoEmpty ) &&
-             ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )
+        if ( ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )
         {
             cmdStopDG();
             requestNewOperationMode( MODE_STAN );