Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rbb80dbac26147ab08413efa91007f7ffed43c38f -rbd8d1a18ca5d9dd52c1082f74c19b90ca925af92
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bb80dbac26147ab08413efa91007f7ffed43c38f)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bd8d1a18ca5d9dd52c1082f74c19b90ca925af92)
@@ -442,10 +442,9 @@
  * @details Outputs: Heparin command response msg constructed and queued.
  * @param accepted flag indicating whether request was accepted
  * @param rejReason rejection reason code
- * @param heparinDeliveryState current Heparin delivery state
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendHeparinCommandResponse( U32 accepted, U32 rejReason, U32 heparinDeliveryState )
+BOOL sendHeparinCommandResponse( U32 accepted, U32 rejReason )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -454,13 +453,11 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE;
-    msg.hdr.payloadLen = sizeof( U32 ) * 3;
+    msg.hdr.payloadLen = sizeof( U32 ) * 2;
 
     memcpy( payloadPtr, &accepted, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, &rejReason, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &heparinDeliveryState, sizeof( U32 ) );
 
     // 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_2_UI, ACK_REQUIRED );
@@ -2308,10 +2305,9 @@
  * @param accepted T/F - was saline bolus request accepted?
  * @param rejReason reason why request was rejected (or zero if accepted)
  * @param bolusVol volume (in mL) currently set for saline bolus
- * @param bolusState current state of saline bolus
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendSalineBolusResponse( BOOL accepted, U32 rejReason, U32 bolusVol, U32 bolusState )
+BOOL sendSalineBolusResponse( BOOL accepted, U32 rejReason, U32 bolusVol )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -2320,15 +2316,13 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_USER_SALINE_BOLUS_RESPONSE;
-    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 );
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + sizeof( U32 );
 
     memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
     payloadPtr += sizeof( BOOL );
     memcpy( payloadPtr, &rejReason, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, &bolusVol, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &bolusState, sizeof( U32 ) );
 
     // 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_2_UI, ACK_REQUIRED );