Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r10259cb982684bf10863cb4586a4214fcc3528a9 -rc05775820109b5e83596c58a3b4248ac6cdb1d65
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 10259cb982684bf10863cb4586a4214fcc3528a9)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c05775820109b5e83596c58a3b4248ac6cdb1d65)
@@ -122,7 +122,6 @@
 static void setupForSelfTestsStop( void );
 
 static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestsWaitForClosedDoor( void );
-static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestLeakDetectorsState( void );
 static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestHomeValvesState( void );
 static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestHomeSyringePumpState( void );
 static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestPumpsState( void );
@@ -265,13 +264,9 @@
 
             // TODO: Use appropriate sensor driver
             setFPGASensorTest( BLOOD_LEAK_SELF_TEST_SET );
-            currentNoCartSelfTestsState = NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE;
+            currentNoCartSelfTestsState = NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE;
             break;
 
-        case NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE:
-            currentNoCartSelfTestsState = handleNoCartSelfTestLeakDetectorsState();
-            break;
-
         case NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE:
             // TODO: Implement self tests
             currentNoCartSelfTestsState = NO_CART_SELF_TESTS_HOME_VALVES_STATE;
@@ -595,39 +590,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleNoCartSelfTestLeakDetectorsState function verifies leak detectors status.
- * @details Inputs: none
- * @details Outputs: none
- * @return the next state of no cartridge self-tests state machine
- *************************************************************************/
-static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestLeakDetectorsState( void )
-{
-    NO_CART_SELF_TESTS_STATE_T state = NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE;
-    // TODO: Use appropriate sensor driver
-    BOOL const bloodLeakDetector = getFPGABloodLeakDetectorStatus();
-
-    if ( TRUE == bloodLeakDetector )
-    {
-        // TODO: Use appropriate sensor driver
-        setFPGASensorTest( BLOOD_LEAK_NORMAL_OPERATION );
-        state = NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE;
-    }
-    else
-    {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE, (U32)bloodLeakDetector );
-    }
-
-    if ( TRUE == doesAlarmStatusIndicateStop() )
-    {
-        setupForSelfTestsStop();
-        state = NO_CART_SELF_TESTS_STOPPED_STATE;
-    }
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleNoCartSelfTestHomeValvesState function starts homing process for
  * all the valves.
  * @details Inputs: none