Index: firmware/App/Drivers/BPDriver.c
===================================================================
diff -u -r82e0b3947c200cddb401f2eeb22db4a4711d174d -rdb1a5faaa7de9f8be163e2d5f5edae5e49f74f1e
--- firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
+++ firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision db1a5faaa7de9f8be163e2d5f5edae5e49f74f1e)
@@ -43,9 +43,7 @@
    BP_DRIVER_IDLE_STATE = 0,                                                        ///< Blood pressure driver idle state
    BP_DRIVER_CLEAR_CMD_STATE,                                                       ///< Blood pressure driver clear command state
    BP_DRIVER_WAIT_CLEAR_CMD_STATE,                                                  ///< Blood pressure driver wait clear command state
-   BP_DRIVER_SEND_CMD_STATE,                                                        ///< Blood pressure driver send command state
    BP_DRIVER_WAIT_FPGA_ACK_STATE,                                                   ///< Blood pressure driver wait FPGA acknowledge state
-   BP_DRIVER_CLEAR_CMD_AFTER_ACK_STATE,                                             ///< Blood pressure driver clear command after acknowledge state
    BP_DRIVER_WAIT_MODULE_START_STATE,                                               ///< Blood pressure driver wait module start state
    BP_DRIVER_WAIT_MEASUREMENT_COMPLETE_STATE,                                       ///< Blood pressure driver wait measurement complete state
    BP_DRIVER_GET_DATA_STATE,                                                        ///< Blood pressure driver get data state
@@ -72,7 +70,6 @@
 static BP_DRIVER_STATE_T handleBPDriverClearCmdState( void );
 static BP_DRIVER_STATE_T handleBPDriverWaitClearCmdState( void );
 static BP_DRIVER_STATE_T handleBPDriverWaitFpgaAckState( void );
-static BP_DRIVER_STATE_T handleBPDriverClearCmdAfterAckState( void );
 static BP_DRIVER_STATE_T handleBPDriverWaitModuleStartState( void );
 static BP_DRIVER_STATE_T handleBPDriverWaitMeasurementCompleteState( void );
 static BP_DRIVER_STATE_T handleBPDriverGetDataState( void );
@@ -143,10 +140,6 @@
             bpDriverState = handleBPDriverWaitFpgaAckState();
             break;
 
-        case BP_DRIVER_CLEAR_CMD_AFTER_ACK_STATE:
-            bpDriverState = handleBPDriverClearCmdAfterAckState();
-            break;
-
         case BP_DRIVER_WAIT_MODULE_START_STATE:
             bpDriverState = handleBPDriverWaitModuleStartState();
             break;
Index: firmware/App/Services/AlarmMgmtTD.c
===================================================================
diff -u -r395522dffef1348e176564925656012f529c1910 -rdb1a5faaa7de9f8be163e2d5f5edae5e49f74f1e
--- firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision 395522dffef1348e176564925656012f529c1910)
+++ firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision db1a5faaa7de9f8be163e2d5f5edae5e49f74f1e)
@@ -240,7 +240,7 @@
             // If alarm is a fault (and not in service mode), request transition to fault mode
             if ( ( TRUE == props.alarmIsFault ) && ( getCurrentOperationMode() != MODE_SERV ) )
             {
-                requestNewOperationMode( MODE_FAUL );
+                //requestNewOperationMode( MODE_FAUL );
             }
 
             // If alarm has stop property, signal stop now