Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rf1991666c75a50418876ef4b1c7aa282538ffe93 -rf32a4f8d14311157ebb45fcbd37a6cb69870732e
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision f1991666c75a50418876ef4b1c7aa282538ffe93)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision f32a4f8d14311157ebb45fcbd37a6cb69870732e)
@@ -187,8 +187,8 @@
     airTrapLevels[ AIR_TRAP_LEVEL_SENSOR_UPPER ].data = (U32)( TRUE == upper ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID );
 
     if ( ( MODE_TREA == getCurrentOperationMode() ) &&
-       ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
-       ( AIR_TRAP_VALVE_OPEN_STATE == airTrapControllerState ) )
+         ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
+         ( AIR_TRAP_VALVE_OPEN_STATE == airTrapControllerState ) )
     {
         if ( ++airTrapUpperLevelCtr >= AIR_TRAP_UPPER_LEVEL_PERSISTENCE )
         {
@@ -368,7 +368,6 @@
         if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
 #endif
         {
-
             if ( AIR_PUMP_STATE_ON == getAirPumpState() )
             {
                 airPumpUpperlevelctr++;
@@ -428,19 +427,6 @@
         setValveAirTrap( STATE_CLOSED );
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }
-    // Turn air pump off once we detect air at lower level.
-    else if ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) )
-    {
-#ifndef _RELEASE_
-        if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
-#endif
-        {
-            if ( AIR_PUMP_STATE_ON == getAirPumpState() )
-            {
-                setAirPumpState( AIR_PUMP_STATE_OFF );
-            }
-        }
-    }
     return result;
 }