Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r1a5efe97f5f39594b45797fded52cafce92afe80 -r7ed011e79e1338f614cbcc7d3cedf07d359196b7
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 1a5efe97f5f39594b45797fded52cafce92afe80)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 7ed011e79e1338f614cbcc7d3cedf07d359196b7)
@@ -35,12 +35,7 @@
 {
     VALVE_STATE_OPEN = 0,       ///< Open valve state, used only for VPi, VBf, VRD1, VRD2, and VSP
     VALVE_STATE_CLOSED,         ///< Closed valve state, used only for VPi, VBf, VRD1, VRD2, and VSP
-#ifndef V_2_SYSTEM
     VALVE_STATE_OPEN_C_TO_NC,   ///< Open Common to Normally Closed valve state, used only for VPd
-#else
-    VALVE_STATE_OPEN_C_TO_NO,   ///< Open Common to Normally Open valve state, used only for VPd
-    VALVE_STATE_DRAIN_C_TO_NC,  ///< Drain Common to Normally Closed valve state, used only for VPd
-#endif
     VALVE_STATE_NOFILL_C_TO_NO, ///< No Fill Common to Normally Open valve state, used only for VPo
     VALVE_STATE_FILL_C_TO_NC,   ///< Fill Common to Normally Closed valve state, used only for VPo
     VALVE_STATE_DRAIN_C_TO_NO,  ///< Drain Common to Normally Open valve state, used only for VDr and VRc. It is also used for VPd in V3
@@ -65,10 +60,8 @@
     VDR,              ///< Valve Drain
     VPI,              ///< Valve Pressure Inlet
     VSP,              ///< Valve Sampling Port
-#ifndef V_2_SYSTEM
     VRD1,             ///< Valve Reservoir 1 Drain
     VRD2,             ///< Valve Reservoir 2 Drain
-#endif
     VPD,              ///< Valve Production Drain
     NUM_OF_VALVES     ///< Number of valves
 } VALVES_T;