Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -rdbcbd145954ef52510ac929a412e0dba42f0941b -ra4f5ed3748870d287a4c2c6fcc003fc4d3b9233f
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision dbcbd145954ef52510ac929a412e0dba42f0941b)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision a4f5ed3748870d287a4c2c6fcc003fc4d3b9233f)
@@ -50,7 +50,6 @@
     S16 posA;                          ///< Calculated Position A
     S16 posB;                          ///< Calculated Position B
     U32 pwm;                           ///< Valve PWM in the bypass mode
-    U32 airTrapValve             ///< Air trap valve status
 
 } HD_VALVE_DATA_T;
 
@@ -71,6 +70,7 @@
     S16 cmdPosition;
 } HD_VALVE_FAST_DATA_T;
 #pragma pack(pop)
+HD_VALVE_FAST_DATA_T fastDataRemoveLater;
 // TODO REMOVE THE struct
 
 // ********** public function prototypes *********
@@ -81,16 +81,14 @@
 
 void execValves( void );
 
-BOOL homeValve( VALVE_T valve );
+void homeValve( VALVE_T valve );
 
 BOOL setValvePosition( VALVE_T valve, VALVE_POSITION_T position );
 
 VALVE_POSITION_T getValvePosition( VALVE_T valve );
 
 void setValveAirTrap( OPN_CLS_STATE_T state );
 
-OPN_CLS_STATE_T getValveAirTrapStatus( void );
-
 BOOL testSetValvesDataPublishInterval( U32 value );
 
 BOOL testResetValvesDataPublishInterval( void );