Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rbbd8ef64eb4b178ca76a9721908fee7347a71c6a -r6679a2cd813b21a8cb4c58b3eeb721e0eef9a10b
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision bbd8ef64eb4b178ca76a9721908fee7347a71c6a)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 6679a2cd813b21a8cb4c58b3eeb721e0eef9a10b)
@@ -199,7 +199,6 @@
 // ********** private function prototypes **********
 
 static BOOL sendTestAckResponseMsg( MSG_ID_T msgID, BOOL ack );
-static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack );
 
 /*********************************************************************//**
  * @brief
@@ -325,7 +324,7 @@
  * @param ack TRUE if test message was handled successfully, FALSE if not
  * @return TRUE if response message successfully queued for transmit, FALSE if not
  *************************************************************************/
-static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack )
+BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -589,57 +588,7 @@
     return status;
 }
 
-/*********************************************************************//**
- * @brief
- * The handleDialysateDeliveryRequestMsg function handles a dailysate
- * delivery request from TD and updates dialysate flowrate, UF rate,
- * dialysate temperature, dialyzer bypass and concentrate types ( acid
- * and bicarb types).
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return TRUE if message is sucessfully parsed, FALSE if not.
- *************************************************************************/
-BOOL handleDialysateDeliveryRequestMsg( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) )
-    {
-        DIALYSATE_DELIVERY_REQ_PAYLOAD_T startTxRequest;
-        DD_OP_MODE_T ddMode = getCurrentOperationMode();
-
-        memcpy( &startTxRequest, message->payload, sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) );
-
-        if ( ( DD_MODE_STAN == ddMode ) && ( TRUE == startTxRequest.start ) )
-        {
-            result = requestDDStart();
-        }
-        else if ( ( DD_MODE_GEND == ddMode ) && ( FALSE == startTxRequest.start ) )
-        {
-            result = requestDDStop();
-        }
-
-        if ( ddMode >= DD_MODE_STAN )
-        {
-            // Set dialysate flow rate, UF rate and dialysate temperature
-            setTDDialysateFlowrate( startTxRequest.dialRate );
-            setTDUFRate( startTxRequest.ufRate );
-            setTDTargetDialysateTemperature( startTxRequest.dialTemp );
-
-            // Set concentrate types, Bypass dialyzer
-            setTDAcidAndBicarbType( startTxRequest.acidType, startTxRequest.bicarbType );
-            setTDDialyzerBypass( startTxRequest.bypassDialyzer );
-
-            result |= TRUE;
-        }
-    }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DD_2_TD, result );
-
-    return result;
-}
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/