Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r23e8d8f0b87d4b5da99eae0182b13bf0b5f4e9e9 -r9163776b3940f1b8330d152e54617396e179bfca
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 23e8d8f0b87d4b5da99eae0182b13bf0b5f4e9e9)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 9163776b3940f1b8330d152e54617396e179bfca)
@@ -46,11 +46,6 @@
     NUM_OF_RECOVERY_STATES            ///< Number of recovery states
 } RECOVERY_STATE_T;
 
-#define NUM_OF_DD_VALVES      ( ( LAST_DD_VALVE - FIRST_DD_VALVE ) + 1 )
-#define NUM_OF_IOFP_VALVES    ( ( LAST_FP_VALVE - FIRST_IO_VALVE ) + 1 )
-#define NUM_OF_IO_VALVES      ( ( LAST_IO_VALVE - FIRST_IO_VALVE ) + 1 )
-#define NUM_OF_FP_VALVES      ( ( LAST_FP_VALVE - FIRST_FP_VALVE ) + 1 )
-
 #pragma pack(push, 1)
 /// Valves publish structure
 typedef struct
@@ -66,7 +61,7 @@
 {
     U08 valvesIOState;                            ///< Commanded IO valve states (bits).
     U08 valvesFPState;                            ///< Commanded FP valve states (bits).
-    U08 valvesSensedState[ NUM_OF_IOFP_VALVES ];  ///< Sensed FP valve states (enumerations).
+    U08 valvesSensedState[ LAST_FP_VALVE - FIRST_IO_VALVE + 1 ];  ///< Sensed FP valve states (enumerations).
 } FP_VALVES_DATA_T;
 
 /// Balancing chamber valve states override structure