Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r47205a5002f27add91d8548f31c8a6fa18993fea -r54e58f64179ea382d2e2c403c8c3b9a15a612636
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 47205a5002f27add91d8548f31c8a6fa18993fea)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 54e58f64179ea382d2e2c403c8c3b9a15a612636)
@@ -302,15 +302,11 @@
     setValveState( VPI, VALVE_STATE_CLOSED );
 
     // Request a tare for reservoir 1
-    tareReservoir(); // TODO remove the function
+    tareLoadCell( LOAD_CELL_RESERVOIR_1_PRIMARY );
+    tareLoadCell( LOAD_CELL_RESERVOIR_1_BACKUP );
 
-#ifndef V_2_SYSTEM
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );
-#else
-    // Set the actuators to drain R1
-    setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-#endif
 
     setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
@@ -344,20 +340,15 @@
         if ( TRUE == isThisInitialDrain )
         {
             // Request a tare for reservoir 2
-            tareReservoir();
+            tareLoadCell( LOAD_CELL_RESERVOIR_2_PRIMARY );
+            tareLoadCell( LOAD_CELL_RESERVOIR_2_BACKUP );
         }
 
-#ifndef V_2_SYSTEM
         // Close reservoir 1 drain
         setValveState( VRD1, VALVE_STATE_CLOSED );
         // Set the actuators to drain R2
         // NOTE: Drain pump is already on and VDr is already on drain state
         setValveState( VRD2, VALVE_STATE_OPEN );
-#else
-        // Set the actuators to drain R2
-        // NOTE: Drain pump is already on and VDr is already on drain state
-        setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
-#endif
 
         stateTimerStart = getMSTimerCount();
         rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -397,25 +388,17 @@
          {
              // Set the actuators to flush drain
              setValveState( VPI, VALVE_STATE_OPEN );
-#ifndef V_2_SYSTEM
              setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
              setValveState( VRD2, VALVE_STATE_CLOSED );
-#else
-             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
-#endif
 
              state = DG_FLUSH_STATE_FLUSH_DRAIN;
          }
          else
          {
              // Set the actuators to pull fresh water in to drain the circulation line
              setValveState( VPI, VALVE_STATE_OPEN );
-#ifndef V_2_SYSTEM
              setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
              setValveState( VRD2, VALVE_STATE_CLOSED );
-#else
-             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
-#endif
              setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
              setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
              setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
@@ -449,11 +432,7 @@
 
     if ( TRUE == didTimeout( stateTimerStart, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-#else
-        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
-#endif
         setROPumpTargetFlowRate( RO_PUMP_TARGET_FLOW_RATE_LPM, RO_PUMP_MAX_PRESSURE_PSI );
 
         // Turn on the UV reactors
@@ -488,8 +467,8 @@
         setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN );
 
         // Turn on the concentrate pumps
-        requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
+        requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
+        requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 
         stateTimerStart = getMSTimerCount();
 
@@ -515,8 +494,8 @@
     if ( TRUE == didTimeout( stateTimerStart, FLUSH_CONCENTRATE_STRAWS_TIME_MS ) )
     {
         // Done with flushing the concentrate pumps line
-        requestConcentratePumpsOff( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2_BICARB );
+        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
+        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
 
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
@@ -577,11 +556,8 @@
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
-#ifndef V_2_SYSTEM
             setValveState( VRD1, VALVE_STATE_OPEN );
-#else
-            setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-#endif
+
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
             stateTimerStart = getMSTimerCount();
 
@@ -631,9 +607,7 @@
     {
         // Done with draining R1
         signalDrainPumpHardStop();
-#ifndef V_2_SYSTEM
         setValveState( VRD1, VALVE_STATE_CLOSED );
-#endif
     }
     // Reservoir 1 drain time out
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
@@ -670,11 +644,7 @@
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
             signalROPumpHardStop();
-#ifndef V_2_SYSTEM
             setValveState( VRD1, VALVE_STATE_OPEN );
-#else
-            setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-#endif
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
             stateTimerStart = getMSTimerCount();
@@ -724,11 +694,7 @@
     {
         // Set the actuators to transition to flush circulation
         // The valves are set to do flush drain and flush circulation
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
-#else
-        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
-#endif
         setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
         setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
         setROPumpTargetFlowRate( RO_PUMP_TARGET_FLOW_RATE_LPM, RO_PUMP_MAX_PRESSURE_PSI );
@@ -762,11 +728,7 @@
 
     if ( TRUE == didTimeout( stateTimerStart, FLUSH_CIRCULATION_WAIT_TIME_MS ) )
     {
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-#else
-        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
-#endif
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
 
@@ -845,12 +807,8 @@
 
         // Set the actuators
         setValveState( VPI, VALVE_STATE_CLOSED );
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRD2, VALVE_STATE_OPEN );
-#else
-        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
-#endif
 
         // Set both reservoirs to be considered as full
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -877,13 +835,8 @@
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
-#ifndef V_2_SYSTEM
             setValveState( VRD1, VALVE_STATE_OPEN );
             setValveState( VRD2, VALVE_STATE_CLOSED );
-#else
-            // Set the drain valve to reservoir 1
-            setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-#endif
         }
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
@@ -899,9 +852,7 @@
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
-#ifndef V_2_SYSTEM
             setValveState( VRD2, VALVE_STATE_CLOSED );
-#endif
             // Done with draining
             signalDrainPumpHardStop();