Index: firmware/App/HDCommon.h
===================================================================
diff -u -rcfffd58901fe6e82c6a74bd752c94b866ed0d3e7 -r57a46c4ea06d840444d7f6e02f1bc0fde7a1c37f
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision cfffd58901fe6e82c6a74bd752c94b866ed0d3e7)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 57a46c4ea06d840444d7f6e02f1bc0fde7a1c37f)
@@ -72,6 +72,8 @@
 //    #define DISABLE_BATT_COMM               1           // Disable battery communication.
     #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
     #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
+    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
+    #define SKIP_EMPTY_RES_CHECK            1           // Skip reservoir empty check
 
     #include <stdio.h>
     #include <strings.h>
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rea0047d0cb48b899475cf519e7e4997d96f5e538 -r57a46c4ea06d840444d7f6e02f1bc0fde7a1c37f
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision ea0047d0cb48b899475cf519e7e4997d96f5e538)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 57a46c4ea06d840444d7f6e02f1bc0fde7a1c37f)
@@ -696,13 +696,10 @@
  *************************************************************************/
 static UF_STATE_T handleUFStartState( DIALYSIS_STATE_T *dialysisState )
 {
-    UF_STATE_T result;
-
     lastUFTimeStamp = getMSTimerCount();
     uFTimeMS = 0;
-    result = UF_RUNNING_STATE;
 
-    return result;
+    return UF_RUNNING_STATE;
 }
 
 /*********************************************************************//**