Index: App/Contollers/Buttons.c
===================================================================
diff -u -rad8ad611c910747eef92336a30b6520a83409532 -r0cb75584d8a588f5392a5c54343c4ebca5079d40
--- App/Contollers/Buttons.c	(.../Buttons.c)	(revision ad8ad611c910747eef92336a30b6520a83409532)
+++ App/Contollers/Buttons.c	(.../Buttons.c)	(revision 0cb75584d8a588f5392a5c54343c4ebca5079d40)
@@ -116,9 +116,8 @@
  *************************************************************************/
 BOOL isStopButtonPressed( void )
 {
-    BOOL result = FALSE;
+    BOOL result = stopButtonPressPending;
 
-    result = stopButtonPressPending;  // TODO - put a timeout on pending stop button, trigger s/w fault if not consumed in reasonable time
     stopButtonPressPending = FALSE;
 
     return result;
@@ -172,8 +171,6 @@
  *************************************************************************/
 void userConfirmOffButton( void )
 {
-    OP_MODE opMode = getCurrentOperationMode();
-
     if ( TRUE == isCurrentOpModeOkToTurnOff() )
     {
         offButtonPressPending = TRUE;
@@ -222,8 +219,6 @@
     {
         if ( offButtonState == BUTTON_STATE_PRESSED )
         {
-            OP_MODE opMode = getCurrentOperationMode();
-
             // if off request in a valid mode, send to UI for user confirmation
             if ( TRUE == isCurrentOpModeOkToTurnOff() )
             {