Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -505,7 +505,6 @@
  *************************************************************************/
 void resetBloodPumpRotorCount( void )
 {
-#ifndef WORN_OUT_CARTRIDGE
     if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) != SW_CONFIG_ENABLE_VALUE )
     {
         bloodPumpRotorCounter.data = 0;
@@ -514,9 +513,6 @@
     {
         bloodPumpRotorCounter.data = BP_MAX_ROTOR_COUNT_FOR_WEAR;
     }
-#else
-    bloodPumpRotorCounter.data = BP_MAX_ROTOR_COUNT_FOR_WEAR;
-#endif
 }
 
 /*********************************************************************//**
@@ -1075,32 +1071,29 @@
         BOOL isDirIncorrect;
         U08 dirErrorCnt = getFPGABloodPumpHallSensorStatus() & PUMP_DIR_ERROR_COUNT_MASK;
 
-#ifndef DISABLE_PUMP_DIRECTION_CHECKS
         // Check pump direction error count
         if ( ( lastBloodPumpDirectionCount != dirErrorCnt ) &&
              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
         {
             lastBloodPumpDirectionCount = dirErrorCnt;
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_BLOOD_PUMP )
         }
-#endif
         bpMCDir = ( getMeasuredBloodPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
         bpDir = ( getMeasuredBloodPumpSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
 
         // Check set direction vs. direction from hall sensors vs. direction from sign of motor controller speed
         isDirIncorrect = ( bloodPumpDirectionSet != bpDir ) || ( bloodPumpDirectionSet != bpMCDir );
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, isDirIncorrect ) )
+        if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, isDirIncorrect ) ) &&
+             ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
         {
-#ifndef DISABLE_PUMP_DIRECTION_CHECKS
-            if ( ( bloodPumpDirectionSet != bpDir ) && ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
+            if ( bloodPumpDirectionSet != bpDir )
             {
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, (U32)bloodPumpDirectionSet, (U32)bpDir )
             }
             else
             {
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, (U32)bloodPumpDirectionSet, (U32)bpMCDir )
             }
-#endif
         }
     }
     else
@@ -1131,10 +1124,8 @@
                                                ( 0 == targetBloodFlowRate ) && ( measMotorSpeed > BP_MAX_MOTOR_SPEED_WHILE_OFF_RPM ) ) ) &&
          ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
     {
-#ifndef DISABLE_PUMP_SPEED_CHECKS
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_BLOOD_PUMP_OFF_CHECK, measMotorSpeed );
         activateSafetyShutdown();
-#endif
     }
 
     // Checks that only occur when pump is running (and beyond ramp).
@@ -1152,18 +1143,14 @@
              ( deltaMotorSpeed > BP_MAX_MOTOR_SPEED_ERROR_RPM ) || ( deltaMCMotorSpeed > BP_MAX_MOTOR_SPEED_ERROR_RPM ) ) ) &&
              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
         {
-#ifndef DISABLE_PUMP_SPEED_CHECKS
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK, cmdMotorSpeed, measMotorSpeed );
-#endif
         }
 
         // Check measured rotor speed vs. measured motor speed while controlling to target
         if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK, deltaRotorSpeed > BP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) ) &&
              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
         {
-#ifndef DISABLE_PUMP_SPEED_CHECKS
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK, measRotorSpeed, measMotorSpeed );
-#endif
         }
     }
     else
@@ -1192,9 +1179,7 @@
     if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, isOffMCCurrentBad || isRunningMCCurrentBad ) ) &&
          ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
     {
-#ifndef DISABLE_MOTOR_CURRENT_CHECKS
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, bpCurr );
-#endif
     }
 }
 
@@ -1208,7 +1193,6 @@
  *************************************************************************/
 static void checkBloodPumpFlowRate( void )
 {
-#ifndef DISABLE_PUMP_FLOW_CHECKS
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
     {
         F32 flow = getMeasuredBloodFlowRate();
@@ -1219,7 +1203,6 @@
             SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, flow );
         }
     }
-#endif
 }
 
 /*********************************************************************//**