Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r1c74566ff86f1df5e1929b8715d68715dc21a93b -r7ed011e79e1338f614cbcc7d3cedf07d359196b7
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 1c74566ff86f1df5e1929b8715d68715dc21a93b)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 7ed011e79e1338f614cbcc7d3cedf07d359196b7)
@@ -166,11 +166,7 @@
         flushFilterRequest = FALSE;
         filterFlushStartTime = getMSTimerCount();
         setValveState( VPI, VALVE_STATE_OPEN );
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-#else
-        setValveState( VPD, VALVE_STATE_OPEN );  // TODO: VPD drain state is closed for V3
-#endif
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER;
     }
     else if ( TRUE == pendingStartDGRequest )
@@ -249,11 +245,7 @@
     {
         endSampleWaterRequest = FALSE;
         setValveState( VPI, VALVE_STATE_CLOSED );
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
-#else
-        setValveState( VPD, VALVE_STATE_CLOSED );
-#endif
         state = DG_STANDBY_MODE_STATE_IDLE;
     }
 
@@ -278,11 +270,7 @@
         stopSampleWaterRequest = FALSE;
         setValveState( VSP, VALVE_STATE_CLOSED );
 
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
-#else
-        setValveState( VPD, VALVE_STATE_OPEN );     // TODO: VPD drain state is closed for V3
-#endif
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE;
     }