Index: firmware/App/Drivers/BPDriver.c
===================================================================
diff -u -r3800374f3f5172afec5e9fa96acc6ee4a234e170 -r82e0b3947c200cddb401f2eeb22db4a4711d174d
--- firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 3800374f3f5172afec5e9fa96acc6ee4a234e170)
+++ firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
@@ -261,31 +261,15 @@
 
     if ( 0 != ( getNIBPControlStatus() & BP_FPGA_CMD_GIVEN_MASK ) )
     {
-        nextState = BP_DRIVER_CLEAR_CMD_AFTER_ACK_STATE;
+        setNIBPCommand( (U08)BP_CMD_IDLE );
+        nextState = BP_DRIVER_WAIT_MODULE_START_STATE;
     }
 
     return nextState;
 }
 
 /*********************************************************************//**
 * @brief
-* The handleBPDriverClearCmdAfterAckState function clears the BP command
-* ready bit after FPGA acknowledge.
-* @details \b Inputs: none
-* @details \b Outputs: none
-* @return next BP driver state
-***************************************************************************/
-static BP_DRIVER_STATE_T handleBPDriverClearCmdAfterAckState( void )
-{
-    BP_DRIVER_STATE_T nextState = BP_DRIVER_WAIT_MODULE_START_STATE;
-
-    setNIBPCommand( (U08)BP_CMD_IDLE );
-
-    return nextState;
-}
-
-/*********************************************************************//**
-* @brief
 * The handleBPDriverWaitModuleStartState function waits for the BP module
 * to signal that the command started.
 * @details \b Inputs: pendingBPCommand
@@ -298,7 +282,8 @@
 
     if ( 0 != ( getNIBPStatusResponse() & BP_MODULE_CMD_STARTED_MASK ) )
     {
-        if ( ( (U08)BP_CMD_START_BP == pendingBPCommand ) || ( (U08)BP_CMD_START_PEDS_BP == pendingBPCommand ) )
+        if ( ( (U08)BP_CMD_START_BP == pendingBPCommand ) ||
+             ( (U08)BP_CMD_START_PEDS_BP == pendingBPCommand ) )
         {
             nextState = BP_DRIVER_WAIT_MEASUREMENT_COMPLETE_STATE;
         }