Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rcdb087f7607a88b29c5ed4cdc9a76e3240fe42a3 -ra50b999266616eb3d0661846cd31bb395c8a7e12
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision cdb087f7607a88b29c5ed4cdc9a76e3240fe42a3)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision a50b999266616eb3d0661846cd31bb395c8a7e12)
@@ -336,34 +336,23 @@
     //Turn on air pump if fluid reaches upper level.
     else if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
     {
-#ifndef _RELEASE_
-        if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
-#endif
+        if ( AIR_PUMP_STATE_OFF == getAirPumpState() )
         {
-            if ( AIR_PUMP_STATE_OFF == getAirPumpState() )
-            {
-                setAirPumpState( AIR_PUMP_STATE_ON );
-                airPumpUpperLevelCtr = 0;
-            }
+            setAirPumpState( AIR_PUMP_STATE_ON );
+            airPumpUpperLevelCtr = 0;
         }
     }
 
     else if ( ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
               ( AIR_TRAP_LEVEL_FLUID == 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() )
         {
-            if ( AIR_PUMP_STATE_ON == getAirPumpState() )
+            airPumpUpperLevelCtr++;
+            // Turn air pump off once we detect air at upper level and exceed persistence
+            if ( airPumpUpperLevelCtr >= AIR_PUMP_UPPER_LEVEL_PERSISTENCE )
             {
-                airPumpUpperLevelCtr++;
-                // Turn air pump off once we detect air at upper level and exceed persistence
-                if ( airPumpUpperLevelCtr >= AIR_PUMP_UPPER_LEVEL_PERSISTENCE )
-                {
-                    setAirPumpState( AIR_PUMP_STATE_OFF );
-                }
+                setAirPumpState( AIR_PUMP_STATE_OFF );
             }
         }
     }
@@ -372,14 +361,9 @@
     else if ( ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
             ( 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() )
         {
-            if ( AIR_PUMP_STATE_ON == getAirPumpState() )
-            {
-                setAirPumpState( AIR_PUMP_STATE_OFF );
-            }
+            setAirPumpState( AIR_PUMP_STATE_OFF );
         }
 
         setValveAirTrap( STATE_OPEN );