Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r51bdd8eedc05856cf35998d1348e3138edecfaf8 -r7ed011e79e1338f614cbcc7d3cedf07d359196b7
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 51bdd8eedc05856cf35998d1348e3138edecfaf8)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 7ed011e79e1338f614cbcc7d3cedf07d359196b7)
@@ -81,7 +81,6 @@
     // re-initialize each time we transition to drain mode
     initDrainMode();
 
-#ifndef V_2_SYSTEM
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
 
     if ( DG_RESERVOIR_1 == inactiveReservoir )
@@ -92,7 +91,6 @@
     {
         setValveStateDelayed( VRD2, VALVE_STATE_OPEN, DELAY_RES_DRAIN_VALVE_MS );
     }
-#endif
     // set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setDrainPumpTargetRPMDelayed( TARGET_DRAIN_PUMP_RPM, DELAY_DRAIN_PUMP_MS );
@@ -170,7 +168,6 @@
     {
         setDrainPumpTargetRPM( 0 );
 
-#ifndef V_2_SYSTEM
         if ( DG_RESERVOIR_1 == inactiveReservoir )
         {
             setValveState( VRD1, VALVE_STATE_CLOSED );
@@ -179,7 +176,6 @@
         {
             setValveState( VRD2, VALVE_STATE_CLOSED );
         }
-#endif
 
         if ( TRUE == isReservoirTarePending() )
         {   // Tare reservoir load cells at empty if requested
@@ -213,10 +209,8 @@
         tareLoadCellsAtEmpty( inactiveReservoir );
         requestNewOperationMode( DG_MODE_GENE );
 
-#ifndef V_2_SYSTEM
         setValveState( VRD1, VALVE_STATE_CLOSED );
         setValveState( VRD2, VALVE_STATE_CLOSED );
-#endif
     }
 
     return result;