Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r1a5efe97f5f39594b45797fded52cafce92afe80 -r7ed011e79e1338f614cbcc7d3cedf07d359196b7
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1a5efe97f5f39594b45797fded52cafce92afe80)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 7ed011e79e1338f614cbcc7d3cedf07d359196b7)
@@ -147,54 +147,26 @@
     switch ( valveStateName )
     {
         case VALVE_STATE_OPEN:
-            if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) )
+            if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) || ( VRD1 == valveID ) || ( VRD2 == valveID ) )
             {
                 result = TRUE;
             }
-#ifndef V_2_SYSTEM
-            if ( ( VRD1 == valveID ) || ( VRD2 == valveID ) )
-            {
-                result = TRUE;
-            }
-#endif
             break;
 
         case VALVE_STATE_CLOSED:
-            if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) )
+            if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) || ( VRD1 == valveID ) || ( VRD2 == valveID ) )
             {
                 result = TRUE;
             }
-#ifndef V_2_SYSTEM
-            if ( ( VRD1 == valveID ) || ( VRD2 == valveID ) )
-            {
-                result = TRUE;
-            }
-#endif
             break;
 
-#ifndef V_2_SYSTEM
         case VALVE_STATE_OPEN_C_TO_NC:
             if ( VPD == valveID )
             {
                 result = TRUE;
             }
             break;
-#else
-        case VALVE_STATE_OPEN_C_TO_NO:
-            if ( VPD == valveID )
-            {
-                result = TRUE;
-            }
-            break;
 
-        case VALVE_STATE_DRAIN_C_TO_NC:
-            if ( VPD == valveID )
-            {
-                result = TRUE;
-            }
-            break;
-#endif
-
         case VALVE_STATE_NOFILL_C_TO_NO:
             if ( valveID == VPO )
             {
@@ -210,16 +182,10 @@
             break;
 
         case VALVE_STATE_DRAIN_C_TO_NO:
-            if ( ( valveID == VDR ) || ( valveID == VRC ) )
+            if ( ( valveID == VDR ) || ( valveID == VRC ) || ( VPD == valveID ) )
             {
                 result = TRUE;
             }
-#ifndef V_2_SYSTEM
-            if ( VPD == valveID )
-            {
-                result = TRUE;
-            }
-#endif
             break;
 
         case VALVE_STATE_RECIRC_C_TO_NC:
@@ -329,19 +295,9 @@
             vState = DEENERGIZED;
             break;
 
-#ifdef V_2_SYSTEM
-        case VALVE_STATE_OPEN_C_TO_NO:
-            vState = DEENERGIZED;
-            break;
-
-        case VALVE_STATE_DRAIN_C_TO_NC:
-            vState = ENERGIZED;
-            break;
-#else
         case VALVE_STATE_OPEN_C_TO_NC:
             vState = ENERGIZED;
             break;
-#endif
 
         case VALVE_STATE_NOFILL_C_TO_NO:
             vState = DEENERGIZED;