Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r32f186b89a400b3e69bae55ba94b0a1b2df940c1 -r18bc9ae45ec3e7c6961ce81cf565699a10362d2c
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 32f186b89a400b3e69bae55ba94b0a1b2df940c1)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 18bc9ae45ec3e7c6961ce81cf565699a10362d2c)
@@ -369,12 +369,6 @@
     U32  qBx                = ( 0 == qB ? MIN_SET_BLOOD_FLOW_RATE : (U32)qB );
     U32  airPumpStopTime    = AIR_PUMP_ON_STOP_TIME_MIN_MS + ( ( qBx - MIN_SET_BLOOD_FLOW_RATE ) / 2 );
 
-    // This is 50 ms delay that was closed on the way out of the open state but it is here now so the VBV is opening first
-    if ( STATE_OPEN == getValveAirTrapStatus() )
-    {
-        setValveAirTrap( STATE_CLOSED );
-    }
-
     // Transition to manual valve control state when requested
     if ( TRUE == pendingStopAirTrapController )
     {
@@ -397,7 +391,6 @@
         }
 
         setValveAirTrap( STATE_OPEN );
-        setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
         fillStartTime = getMSTimerCount();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_OPEN, 0 );
         result = AIR_TRAP_VALVE_OPEN_STATE;
@@ -436,7 +429,6 @@
         }
 
         setValveAirTrap( STATE_OPEN );
-        setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
         fillStartTime = getMSTimerCount();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_OPEN, 0 );
         result = AIR_TRAP_VALVE_OPEN_STATE;
@@ -457,11 +449,6 @@
 {
     AIR_TRAP_STATE_T result = AIR_TRAP_VALVE_OPEN_STATE;
 
-    if ( VALVE_POSITION_B_OPEN == getValvePosition( VBV ) )
-    {
-        setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
-    }
-
     // Transition to manual valve control state when requested
     if ( TRUE == pendingStopAirTrapController )
     {
@@ -471,11 +458,6 @@
     // Transition to closed valve state when fluid detected at upper level
     else if ( AIR_TRAP_LEVEL_FLUID == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
     {
-        if ( TRUE == isBloodPumpRunning() )
-        {
-            setValvePosition( VBV, VALVE_POSITION_B_OPEN );
-        }
-
         airPumpOnDelayStartTime = u32DiffWithWrap( AIR_PUMP_ON_DELAY_ADJUST_AFTER_FILL, getMSTimerCount() );
         signalLowVenousPressureCheck();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_CLOSED, 0 );