Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re4b79bd0d31e779619a787f9ce4352d0fd3d4dce -r35246359c5a9080c704e0a6f1563e99a337e2e91
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e4b79bd0d31e779619a787f9ce4352d0fd3d4dce)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 35246359c5a9080c704e0a6f1563e99a337e2e91)
@@ -478,46 +478,12 @@
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The broadcastROPumpData function sends out RO pump data.
- * @details Inputs: none
- * @details Outputs: RO pump data msg constructed and queued
- * @param tgtPressure target pressure for RO pump in PSI
- * @param measFlow measure RO flow rate in LPM
- * @param setPWM set PWM duty cycle in %
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastROPumpData( U32 tgtPressure, F32 measFlow, F32 setPWM )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    RO_PUMP_DATA_T payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_RO_PUMP_DATA;
-    msg.hdr.payloadLen = sizeof( RO_PUMP_DATA_T );
-
-    payload.setROPumpPressure = tgtPressure;
-    payload.measROFlowRate = measFlow;
-    payload.roPumpPWM = setPWM;
-
-    memcpy( payloadPtr, &payload, sizeof( RO_PUMP_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_DG_BROADCAST, ACK_NOT_REQUIRED );
-
-    return result;
-}
-
 /*********************************************************************//**
  * @brief
  * The broadcastDrainPumpData function sends out the drain pump data.
- * @details Inputs : none
- * @details Outputs : Drain pump data msg constructed and queued
- * @param drain pump data structure pointer
+ * @details Inputs: none
+ * @details Outputs: Drain pump data msg constructed and queued
+ * @param drainPumpData which is the drain pump data structure pointer
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastDrainPumpData( DRAIN_PUMP_DATA_T *drainPumpData )
@@ -1507,25 +1473,25 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestDrainPumpSetPointOverrideRequest function handles a request to
+ * The handleTestDrainPumpRPMOverrideRequest function handles a request to
  * override the drain pump speed set point (in RPM).
- * @details
- * Inputs : none
- * Outputs : message handled
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        U32 payLoad;
 
-        result = testSetTargetDrainPumpRPM( payload.state.u32 );
+        memcpy( &payLoad, message->payload, sizeof( U32 ) );
+
+        result = testSetTargetDrainPumpRPM( payLoad );
     }
 
     // respond to request
@@ -1536,9 +1502,8 @@
  * @brief
  * The handleTestDrainPumpDataBroadcastIntervalOverrideRequest function handles
  * a request to override the broadcast interval for drain pump data.
- * @details
- * Inputs : none
- * Outputs : message handled
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -1672,14 +1637,16 @@
  *************************************************************************/
 void handleSetDrainPumpDeltaPressureOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = 0;
+
     /* verify payload length */
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( F32 ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        F32 payLoad;
 
-        result = testSetTargetDrainPumpDeltaPressure( (U32)(payload.state.u32) );
+        memcpy( &payLoad, message->payload, sizeof( F32 ) );
+
+        result = testSetTargetDrainPumpDeltaPressure( payLoad );
     }
     /* respond to request */
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );