Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r663c6ccbe24d0adf734ca0684510eef70884cdee -rdcbd821e41803adc6e582d909207bc97f85ff939
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 663c6ccbe24d0adf734ca0684510eef70884cdee)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision dcbd821e41803adc6e582d909207bc97f85ff939)
@@ -25,13 +25,10 @@
 typedef enum Msg_IDs
 {
     MSG_ID_UNUSED = 0,
-    MSG_ID_OFF_BUTTON_PRESS,
     MSD_ID_DG_FILL_START_STOP = 0x2000,
     MSG_ID_FIRST_TESTER_MESSAGE = 0xA000,
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE,
     MSG_ID_HD_MESSAGE,
-    MSG_ID_OFF_BUTTON_STATE_OVERRIDE,
-    MSG_ID_STOP_BUTTON_STATE_OVERRIDE,
     MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE,
     MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE,
     NUM_OF_MSG_IDS
@@ -41,8 +38,6 @@
 
 // MSG_ID_OFF_BUTTON_PRESS
 BOOL sendOffButtonMsgToUI( void );
-void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message );
-
 void handleDGFillStartStopMessages( MESSAGE_T *message );
 
 // *********** public test support message functions **********
@@ -60,9 +55,6 @@
 // MSG_ID_OFF_BUTTON_STATE_OVERRIDE
 void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_STOP_BUTTON_STATE_OVERRIDE
-void handleTestStopButtonStateOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE
 void handleTestAlarmLampPatternOverrideRequest( MESSAGE_T *message );