Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5 -r654c5598765bb862c00a0175bdac95604c6c9b24
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 654c5598765bb862c00a0175bdac95604c6c9b24)
@@ -82,10 +82,10 @@
     {
         setValveState( VRD2, VALVE_STATE_OPEN );
     }
-#else
+#endif
+
     // set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
-#endif
 
     setDrainPumpTargetRPM( TARGET_DRAIN_PUMP_RPM );
     setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
@@ -139,20 +139,14 @@
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
 
     // if we have reached our target drain to volume (by weight) or cannot drain anymore, we are done draining - go back to re-circ mode
-    if ( hasTargetDrainVolumeBeenReached( inactiveReservoir, DRAIN_WEIGHT_UNCHANGE_TIMEOUT ) )
+    if ( TRUE == hasTargetDrainVolumeBeenReached( inactiveReservoir, DRAIN_WEIGHT_UNCHANGE_TIMEOUT ) )
     {
         setDrainPumpTargetRPM( 0 );
         requestNewOperationMode( DG_MODE_CIRC );
 
 #ifndef V_2_SYSTEM
-        if ( DG_RESERVOIR_1 == inactiveReservoir )
-        {
-            setValveState( VRD1, VALVE_STATE_CLOSED );
-        }
-        else if ( DG_RESERVOIR_2 == inactiveReservoir )
-        {
-            setValveState( VRD2, VALVE_STATE_CLOSED );
-        }
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+        setValveState( VRD2, VALVE_STATE_CLOSED );
 #endif
     }