Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rad3acf79a6b0fa54234cc3b70b26600790d61500 -rd16609f215cf5ba8e08b902cf12a9492b40ed2cc
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ad3acf79a6b0fa54234cc3b70b26600790d61500)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d16609f215cf5ba8e08b902cf12a9492b40ed2cc)
@@ -4007,7 +4007,7 @@
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
-            result = testSetFluidLeakStateOverride( FLUID_LEAK_STATES_T)(payload.state.u32) );
+            result = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)(payload.state.u32) );
         }
         else
         {
@@ -4148,46 +4148,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestHDCalibrationDataRequest function handles a request for
- * HD calibration data.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestHDCalibrationDataRequest( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    if ( 0 == message->hdr.payloadLen )
-    {
-        CALIBRATION_DATA_T cal;
-        MESSAGE_T msg;
-        U08 *payloadPtr = msg.payload;
-
-        // Get calibration data
-        result = getCalibrationData( &cal );
-        if ( TRUE == result )
-        {
-            // Create a message record
-            blankMessage( &msg );
-            msg.hdr.msgID = MSG_ID_HD_CALIBRATION_DATA;
-            msg.hdr.payloadLen = sizeof( CALIBRATION_DATA_T );
-
-            memcpy( payloadPtr, &cal, sizeof( CALIBRATION_DATA_T ) );
-
-            // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-            result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED );
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestEraseHDCalibrationDataRequest function handles a request for
  * HD calibration data erasure.
  * @details