Index: firmware/App/Services/FluidBolus.c
===================================================================
diff -u -r1abc0349c736a70fb56db6895947abfbba0eee22 -r6b9b882169f108f9a5072dc60cdabbc1687aafcc
--- firmware/App/Services/FluidBolus.c	(.../FluidBolus.c)	(revision 1abc0349c736a70fb56db6895947abfbba0eee22)
+++ firmware/App/Services/FluidBolus.c	(.../FluidBolus.c)	(revision 6b9b882169f108f9a5072dc60cdabbc1687aafcc)
@@ -15,7 +15,6 @@
 *
 ***************************************************************************/
 
-#include "AlarmMgmt.h"
 #include "AlarmMgmtTD.h"
 #include "BloodFlow.h"
 #include "DDInterface.h"
@@ -210,18 +209,13 @@
  * @details \b Outputs: fluidBolusStartRequested, targetBloodFlowMLPM
  * @return none
  *************************************************************************/
-BOOL signalStartFluidBolus( U32 flowRate )
+void signalStartFluidBolus( U32 flowRate )
 {
-    BOOL result = FALSE;
-
     if ( ( FLUID_BOLUS_IDLE_STATE == currentFluidBolusState ) && ( FALSE == fluidBolusStartRequested ) )
     {
         fluidBolusStartRequested = TRUE;
         targetBloodFlowMLPM = flowRate;
-        result = TRUE;
     }
-
-    return result;
 }
 
 /*********************************************************************//**
@@ -611,7 +605,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_INVALID_PAYLOAD_LENGTH, (U32)message->hdr.payloadLen );
+        //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_MESSAGE_PAYLOAD_LENGTH, (U32)message->hdr.payloadLen );
     }
 
     response.accepted        = result;