Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r67021fbc633259e8e1bce76749dbef7d0cb51998 -re6f3a632890f96a5aa282922d11df148bdd06587
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 67021fbc633259e8e1bce76749dbef7d0cb51998)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision e6f3a632890f96a5aa282922d11df148bdd06587)
@@ -304,13 +304,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 );
 
@@ -347,17 +342,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;
@@ -397,25 +386,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 +430,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
@@ -577,11 +554,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 +605,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 +642,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 +692,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 +726,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 +805,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 +833,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 +850,7 @@
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
-#ifndef V_2_SYSTEM
             setValveState( VRD2, VALVE_STATE_CLOSED );
-#endif
             // Done with draining
             signalDrainPumpHardStop();