Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rc08182ef9b9ae04e8d3a0aae96c015ce0f7a2fa5 -r825a299f4ad0f4a51b203c3f5d730c6978ab6844
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision c08182ef9b9ae04e8d3a0aae96c015ce0f7a2fa5)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 825a299f4ad0f4a51b203c3f5d730c6978ab6844)
@@ -1291,7 +1291,6 @@
         // TODO - alarm
     }
 
-
     return result;
 }
 
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rc08182ef9b9ae04e8d3a0aae96c015ce0f7a2fa5 -r825a299f4ad0f4a51b203c3f5d730c6978ab6844
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision c08182ef9b9ae04e8d3a0aae96c015ce0f7a2fa5)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 825a299f4ad0f4a51b203c3f5d730c6978ab6844)
@@ -703,13 +703,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;
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rc08182ef9b9ae04e8d3a0aae96c015ce0f7a2fa5 -r825a299f4ad0f4a51b203c3f5d730c6978ab6844
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c08182ef9b9ae04e8d3a0aae96c015ce0f7a2fa5)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 825a299f4ad0f4a51b203c3f5d730c6978ab6844)
@@ -826,10 +826,6 @@
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {