Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r0f9838d6b8606a6a9853ccb6157e4c25d70ddd02 -r1bc68041f87b8ed0294e24b2ec4a272d15fb8003
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 0f9838d6b8606a6a9853ccb6157e4c25d70ddd02)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 1bc68041f87b8ed0294e24b2ec4a272d15fb8003)
@@ -63,7 +63,6 @@
 static U32 broadcastModeIntervalCtr;                        ///< Interval counter used to determine when to broadcast operation mode.  Initialize to 11 to stagger broadcast.
 /// Interval (in task intervals) at which to publish operation mode data to CAN bus.
 static OVERRIDE_U32_T opModePublishInterval = { BROADCAST_HD_OP_MODE_INTERVAL, BROADCAST_HD_OP_MODE_INTERVAL, BROADCAST_HD_OP_MODE_INTERVAL, 0 };
-static U32 priorSubMode = 0;                                ///< The prior submode state.
 /// Local structure init for saving confirmation requests
 static CONFIRMATION_REQUEST_T confirmRequests[NUM_CONFIRM_REQUESTS] =
                                                    { GENERIC_CONFIRM_ID_NONE, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
@@ -110,7 +109,6 @@
     // Start in init mode
     currentMode              = MODE_INIT;
     currentSubMode           = 0;
-    priorSubMode             = 0;
     broadcastModeIntervalCtr = DATA_PUBLISH_COUNTER_START_COUNT;
 
     transitionToNewOperationMode( MODE_INIT );
@@ -136,9 +134,8 @@
 void execOperationModes( void )
 {
     HD_OP_MODE_T newMode;
+    U32 priorSubMode = currentSubMode;
 
-    priorSubMode = currentSubMode;
-
     // Any new mode requests?
     newMode = arbitrateModeRequest();   // Will return current mode if no pending requests
     newMode = MODE_TRANSITION_TABLE[ currentMode ][ newMode ];
@@ -216,7 +213,6 @@
     {
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )
     }
-    priorSubMode = currentSubMode;
 
     updateConfirmationRequestTimeouts( );
 
@@ -408,10 +404,6 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, newMode )
             break;
     }
-
-    SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )
-
-    priorSubMode = currentSubMode;
 }
 
 /*********************************************************************//**