Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -ra2bc96881a5fc3d8f779246b2abebf15a8de9384 -rccfd15568f1e3d304320c2babb2fd4bcf0413304
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision a2bc96881a5fc3d8f779246b2abebf15a8de9384)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file Buttons.c
+* @file    Buttons.c
 *
-* @author (last) Sean Nash
-* @date (last) 24-Sep-2020
+* @author  (last)      Sean Nash
+* @date    (last)      01-Mar-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -175,7 +175,7 @@
  * @details Outputs: none
  * @return BUTTON_STATE_PRESSED if off button pressed, BUTTON_STATE_RELEASED if not
  *************************************************************************/
-BUTTON_STATE_T  getOffButtonState( void )
+BUTTON_STATE_T getOffButtonState( void )
 {
     BUTTON_STATE_T result = (BUTTON_STATE_T)dataOffButtonState.data;
 
@@ -367,9 +367,6 @@
         {
             // If off request in a valid mode, send to UI for user confirmation
             userConfirmOffButton( OFF_BUTTON_RSP_USER_REQUESTS_POWER_OFF );
-#ifdef SIMULATE_UI
-            userConfirmOffButton( OFF_BUTTON_RSP_USER_CONFIRMS_POWER_OFF );
-#endif
         }
         prevOffButtonState = getOffButtonState();
     }