Index: firmware/App/Modes/ModeRecirculate.c
===================================================================
diff -u -r5d82009d1baa2b52122065934481745bf4de223b -rcbc9f2ba6d1769716ac81ae45283575467f07e2c
--- firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision 5d82009d1baa2b52122065934481745bf4de223b)
+++ firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision cbc9f2ba6d1769716ac81ae45283575467f07e2c)
@@ -80,14 +80,16 @@
  *************************************************************************/
 void transitionToRecirculateMode( void )
 {
-    // re-initialize each time we transition to re-circulate mode
+    // Re-initialize each time we transition to re-circulate mode
     initRecirculateMode();
 
-    // set initial actuator states
+    // Set initial actuator states
     setValveState( VSP, VALVE_STATE_CLOSED );
     setValveState( VPI, VALVE_STATE_OPEN );
 #ifndef V_2_SYSTEM
     setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+    setValveState( VRD1, VALVE_STATE_CLOSED );
+    setValveState( VRD2, VALVE_STATE_CLOSED );
 #endif
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
@@ -125,18 +127,19 @@
  *************************************************************************/
 U32 execRecirculateMode( void )
 {
-    // check inlet water conductivity, temperature, pressure, and RO rejection ratio
+    // Check inlet water conductivity, temperature, pressure, and RO rejection ratio
     checkInletWaterConductivity();
     checkInletWaterTemperature();
     checkInletPressure();
     checkRORejectionRatio();
 
+    // Transition to standby mode when HD is not communicating
     if ( FALSE == isHDCommunicating() )
     {
         requestNewOperationMode( DG_MODE_STAN );
     }
 
-    // execute current re-circulate state
+    // Execute current re-circulate state
     switch ( recircState )
     {
         case DG_RECIRCULATE_MODE_STATE_START:
@@ -178,15 +181,12 @@
     F32 waterFlowRate = getMeasuredROFlowRate();
     F32 waterVolume = ( ( waterFlowRate / SEC_PER_MIN ) / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
 
-    // integrate volume of water moved through line
+    // Integrate volume of water moved through line
     flushLinesVolumeL += waterVolume;
 
-    // when enough water volume has flowed to flush the lines, transition to re-circ state
+    // When enough water volume has flowed to flush the lines, transition to re-circ state
     if ( flushLinesVolumeL >= FLUSH_LINES_VOLUME_L )
     {
-#ifndef SKIP_RECIRC
-        setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
-#endif
         setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
         result = DG_RECIRCULATE_MODE_STATE_RECIRC_WATER;
     }
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r9779d54c908734795f7b03b0ba8c409fc3115437 -rcbc9f2ba6d1769716ac81ae45283575467f07e2c
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 9779d54c908734795f7b03b0ba8c409fc3115437)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision cbc9f2ba6d1769716ac81ae45283575467f07e2c)
@@ -131,8 +131,6 @@
                 cmdResponse.rejected = FALSE;
                 setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
 #ifndef V_2_SYSTEM
-                setValveState( VRD1, VALVE_STATE_CLOSED );
-#else
                 setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
 #endif
                 setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
@@ -144,8 +142,6 @@
                 cmdResponse.rejected = FALSE;
                 setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
 #ifndef V_2_SYSTEM
-                setValveState( VRD2, VALVE_STATE_CLOSED );
-#else
                 setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
 #endif
                 setValveState( VRO, VALVE_STATE_R2_C_TO_NC );