Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rd4c4881844398626062215e8974f9f9c02890dbf -r21d37cf60ade3de697371d2b71b2e7c652e55bd9
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision d4c4881844398626062215e8974f9f9c02890dbf)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 21d37cf60ade3de697371d2b71b2e7c652e55bd9)
@@ -43,7 +43,6 @@
 #define BROADCAST_HD_OP_MODE_INTERVAL     ( 250 / TASK_GENERAL_INTERVAL )                         ///< HD operation mode broadcast interval (in task interval/sec).
 #define DATA_PUBLISH_COUNTER_START_COUNT  11                                                      ///< Data publish counter start count.
 #define MAX_PENDING_CONFIRM_REQUESTS      4                                                       ///< Maximum number of confirmation requests allowed at any given time.
-#define CONFIRMATION_REQUEST_TIMEOUT_MS   ( SEC_PER_MIN * MS_PER_SECOND )                         ///< Confirmation response timeout in ms
 
 /// Structure for confirmation request.
 typedef struct
@@ -89,7 +88,6 @@
 static HD_OP_MODE_T arbitrateModeRequest( void );
 static void transitionToNewOperationMode( HD_OP_MODE_T newMode );
 static void broadcastOperationMode( void );
-static void updateConfirmationRequestTimeouts( void );
 
 /*********************************************************************//**
  * @brief
@@ -228,8 +226,6 @@
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )
     }
 
-    updateConfirmationRequestTimeouts( );
-
     // Broadcast current operation mode on interval
     broadcastOperationMode();
 }
@@ -441,30 +437,6 @@
 
 /*********************************************************************//**
  * @brief
- * The updateConfirmationRequestTimeouts function checks the status of
- *     all active confirmation requests and updates the timeout.
- * @details Inputs: confirmRequests[]
- * @details Outputs: confirmRequests[] status updated if timeout.
- * @return none
- *************************************************************************/
-static void updateConfirmationRequestTimeouts( void )
-{
-    U32 i;
-
-    for ( i = 0; i < MAX_PENDING_CONFIRM_REQUESTS; i++ )
-    {
-        if ( CONFIRMATION_REQUEST_STATUS_PENDING == confirmRequests[ i ].status )
-        {
-            if ( TRUE == didTimeout( confirmRequests[ i ].timeStamp, CONFIRMATION_REQUEST_TIMEOUT_MS ) )
-            {
-                confirmRequests[ i ].status = CONFIRMATION_REQUEST_STATUS_TIMEOUT;
-            }
-        }
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The getConfirmationRequestStatus function returns the status of a confirmation request
  * @details Inputs: confirmRequests[]
  * @details Outputs: confirmRequests[] consumed/cleared if completed.