Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rcecd0a4cd30e14aa9a193ca3e7bf8a27e7a7e5e4 -rd75a0d1309460169f5d83340ed999307e6411bd8
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision cecd0a4cd30e14aa9a193ca3e7bf8a27e7a7e5e4)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision d75a0d1309460169f5d83340ed999307e6411bd8)
@@ -376,11 +376,7 @@
     if ( TRUE == pendingStartAirTrapController )
     {
         pendingStartAirTrapController = FALSE;
-        setPowerResult = setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
-        if ( FALSE == setPowerResult )
-        {
-            // TODO: Alarm
-        }
+        setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
         set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
         set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
         result = AIR_TRAP_CLOSED_STATE;
@@ -418,11 +414,7 @@
         {
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );   // open valve H13 to allow air to be pumped into air trap from atmosphere
             airTrapAirPumpLowerPowerLevel.data = getCalculatedAirPumpDutyCycle();
-            setPowerResult = setAirPumpState( AIR_PUMP_STATE_ON, getAirPumpLowerPowerLevel() );
-            if ( FALSE == setPowerResult )
-            {
-                // TODO: Alarm
-            }
+            setAirPumpState( AIR_PUMP_STATE_ON, getAirPumpLowerPowerLevel() );
             airTrapLowerStartTime = getMSTimerCount();
             signalInitiatePressureStabilization( USE_SHORT_STABILIZATION_PERIOD );
             SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_TRAP_LOWER, ON, 0 );
@@ -434,11 +426,7 @@
     else if ( ( airTrapWasFilledAtStartOfTreatement != TRUE ) ||
               ( AIR_TRAP_LEVEL_AIR == getLevelSensorState( H17_LEVL ) ) )
     {
-        setPowerResult = setAirPumpState( AIR_PUMP_STATE_ON, getAirPumpRaisePowerLevel() );
-        if ( FALSE == setPowerResult )
-        {
-                      // TODO: Alarm
-        }
+        setAirPumpState( AIR_PUMP_STATE_ON, getAirPumpRaisePowerLevel() );
         set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );  // open valve H20 to allow air to be pumped out of air trap to atmosphere
         airTrapFillStartTime = getMSTimerCount();
         SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_TRAP_FILL, ON, 0 );
Index: firmware/App/TDCommon.h
===================================================================
diff -u -r4ed766fe84660297858a9af1651e93ff0c4d71f1 -rd75a0d1309460169f5d83340ed999307e6411bd8
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 4ed766fe84660297858a9af1651e93ff0c4d71f1)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision d75a0d1309460169f5d83340ed999307e6411bd8)
@@ -29,8 +29,6 @@
 
 // ********** development build switches **********
 
-#define AIR_PUMP_PERCENTAGE_DUTY_CYCLE
-
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing