Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r2fff37fa585181917705645494549b5fd4a4d522 -r7ed011e79e1338f614cbcc7d3cedf07d359196b7
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 2fff37fa585181917705645494549b5fd4a4d522)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 7ed011e79e1338f614cbcc7d3cedf07d359196b7)
@@ -298,13 +298,8 @@
     // Request a tare for reservoir 1
     tareReservoir();
 
-#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 );
 
@@ -340,17 +335,11 @@
             tareReservoir();
         }
 
-#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;
@@ -390,25 +379,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( VRC, VALVE_STATE_DRAIN_C_TO_NO );
              setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
              setROPumpTargetFlowRate( FINAL_DRAIN_RO_PUMP_FLOW_LPM, RO_PUMP_MAX_PRESSURE_PSI );
@@ -440,11 +421,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
@@ -557,11 +534,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();
 
@@ -611,9 +585,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 )
@@ -650,11 +622,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();
@@ -703,11 +671,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 );
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
@@ -742,11 +706,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 );
 
@@ -823,12 +783,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;
@@ -853,13 +809,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 )
@@ -875,9 +826,7 @@
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
-#ifndef V_2_SYSTEM
             setValveState( VRD2, VALVE_STATE_CLOSED );
-#endif
             // Done with draining
             signalDrainPumpHardStop();