Index: App/Contollers/Buttons.c
===================================================================
diff -u -r833095dbbe2b21a989b05f48bd7ddc390ad964cb -r29f1ba03faefd982327916590818a260a3e4aa48
--- App/Contollers/Buttons.c	(.../Buttons.c)	(revision 833095dbbe2b21a989b05f48bd7ddc390ad964cb)
+++ App/Contollers/Buttons.c	(.../Buttons.c)	(revision 29f1ba03faefd982327916590818a260a3e4aa48)
@@ -16,9 +16,10 @@
 
 #include "Common.h"
 #include "CPLD.h"
+#include "OperationModes.h"
+#include "SystemCommMessages.h"
 #include "TaskPriority.h"
 #include "Timers.h"
-#include "OperationModes.h"
 #include "Buttons.h"
 
 // ********** private definitions **********
@@ -302,12 +303,9 @@
             {
                 // send off button to UI for user confirmation
                 sendOffButtonMsgToUI();
-// ***************************** TEST CODE ******************************
-// TODO - remove later (just pretend user confirmed for now)
-#if 1
+#ifdef SIMULATE_UI
                 userConfirmOffButton( USER_CONFIRMED );
 #endif
-// ************************** END TEST CODE ******************************
             }
         }
         prevOffButtonState = offButtonState;