Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r9e85e7ace1390d48587174a5bc6eb11d5185cea4 -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -46,15 +46,9 @@
 
 #define DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN         100             ///< Patient connection sub-mode dialysate inlet pump flow rate in mL/min.
 
-#ifndef SKIP_PRIMING
 #define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         500             ///< Fill reservoir to this volume (in mL) to flush filter and lines.
 #define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      1300            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
 #define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      700             ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
-#else
-//#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         FILL_RESERVOIR_TO_VOLUME_ML
-//#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
-//#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
-#endif
 
 /// States of the pre-treatment reservoir management state machine.
 typedef enum PreTreatmentReservoirMgmt_States
@@ -195,9 +189,6 @@
     switch ( currentPreTreatmentState )
     {
         case HD_PRE_TREATMENT_START_STATE:
-#ifndef SKIP_SAMPLE_WATER
-            //transitionToSampleWater();
-#endif
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
             {
                 transitionToSampleWater();
@@ -355,10 +346,6 @@
     BOOL accepted = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM;
 
-#ifdef SKIP_UI_INTERACTION
-    patientConnectionConfirm = TRUE;
-#endif
-
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         patientConnectionConfirm = TRUE;
@@ -654,10 +641,6 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_CART_INSTALL_STATE;
 
-#ifdef SKIP_UI_INTERACTION
-    confirmInstallRequested = TRUE;
-#endif
-
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         confirmInstallRequested = TRUE;
@@ -775,10 +758,6 @@
 
     execPreTreatmentRecirc();
 
-#ifdef SKIP_UI_INTERACTION
-    continueToTreatmentRequested = TRUE;
-#endif
-
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         continueToTreatmentRequested = TRUE;
@@ -1073,12 +1052,6 @@
 
             if ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] )
             {
-#ifdef SKIP_PRIMING
-                //reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
-#else
-                //reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
-                //cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
-#endif
                 if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
                 {
                     reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;