Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1fb58baf6e7e3d1f054b2a3634e233da7609dad9 -rdb29226a158778db9c0bbcc202d3b56f9cf305c8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1fb58baf6e7e3d1f054b2a3634e233da7609dad9)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision db29226a158778db9c0bbcc202d3b56f9cf305c8)
@@ -1157,26 +1157,6 @@
 
     return result;
 }
-
-// TODO remove this function
-BOOL broadcastFastTempHDValves( HD_VALVE_FAST_DATA_T *fastDataRemoveLater )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_TEMP_FAST_HD_VALVES_REMOVE_LATER;
-    msg.hdr.payloadLen = sizeof( HD_VALVE_FAST_DATA_T );
-
-    memcpy( payloadPtr, fastDataRemoveLater, sizeof( HD_VALVE_FAST_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 );
-
-    return result;
-}
 
 #ifdef EMC_TEST_BUILD
 BOOL broadcastCANErrorCount( U32 count )
@@ -3451,13 +3431,13 @@
  *************************************************************************/
 void handleTestHDValvesBroadcastIntervalOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    TEST_OVERRIDE_PAYLOAD_T payload;
 
     BOOL result = FALSE;
     // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
             result = testSetValvesDataPublishInterval( (BOOL)(payload.state.u32) );