Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -r1a685471524555a374854c0c9ec8e208e71fe2df
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -24,6 +24,7 @@
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
 #include "ModePreTreat.h"
+#include "SystemCommMessages.h"
 #ifdef RM46_EVAL_BOARD_TARGET
     #include "Timers.h"
     static U32 start;
@@ -77,17 +78,12 @@
 *************************************************************************/
 U32 execPreTreatmentMode( void )
 {
-   BOOL stop = isStopButtonPressed();
+    BOOL stop = isStopButtonPressed();
 
 #ifndef DISABLE_UI_TREATMENT_WORKFLOW
     if ( TRUE == treatStartReqReceived )
-#else
-#ifndef UF_TEST_ENABLED
-   if ( TRUE == stop )
 #endif
-#endif
     {
-        startAirTrapControl();  // TODO - move to right after prime completes when prime is implemented
         requestNewOperationMode( MODE_TREA );
     }
 #ifdef RM46_EVAL_BOARD_TARGET