Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204 -re22cea17af706bcdaed705302094b096818147b0
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision e22cea17af706bcdaed705302094b096818147b0)
@@ -94,8 +94,6 @@
 static UF_STATE_T handleUFStartState( DIALYSIS_STATE_T *dialysisState );
 static UF_STATE_T handleUFPausedState( DIALYSIS_STATE_T *dialysisState );
 static UF_STATE_T handleUFRunningState( DIALYSIS_STATE_T *dialysisState );
-static UF_STATE_T handleUFOffState( DIALYSIS_STATE_T *dialysisState );
-static UF_STATE_T handleUFCompletedState( DIALYSIS_STATE_T *dialysisState );
 
 static SALINE_BOLUS_STATE_T handleSalineBolusIdleState( DIALYSIS_STATE_T *dialysisState );
 static SALINE_BOLUS_STATE_T handleSalineBolusWait4Pumps2Stop( DIALYSIS_STATE_T *dialysisState );
@@ -448,9 +446,7 @@
  *************************************************************************/
 F32 getUltrafiltrationReferenceVolume( void )
 {
-    F32 result = refUFVolume;
-
-    return result;
+    return refUFVolume;
 }
 
 /*********************************************************************//**
@@ -619,17 +615,9 @@
             currentUFState = handleUFRunningState( &result );
             break;
 
-        case UF_OFF_STATE:
-            currentUFState = handleUFOffState( &result );
-            break;
-
-        case UF_COMPLETED_STATE:
-            currentUFState = handleUFCompletedState( &result );
-            break;
-
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE, currentUFState )
-            currentUFState = UF_COMPLETED_STATE;
+            currentUFState = UF_PAUSED_STATE;
             break;
     }
 
@@ -796,38 +784,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUFCompletedOrOffState function handles the UF Off state
- * of the ultrafiltration state machine.
- * @details Inputs: none
- * @details Outputs: UF volumes updated and provided to DPo pump controller.
- * @param dialysisState next dialysis state
- * @return next ultrafiltration state
- *************************************************************************/
-static UF_STATE_T handleUFOffState( DIALYSIS_STATE_T *dialysisState )
-{
-    UF_STATE_T result = UF_RUNNING_STATE;  // TODO - remove this state and handler
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleUFCompletedState function handles the UF Completed
- * state of the ultrafiltration state machine.  This is a terminal state.
- * @details Inputs: none
- * @details Outputs: UF volumes updated and provided to DPo pump controller.
- * @param dialysisState next dialysis state
- * @return next ultrafiltration state
- *************************************************************************/
-static UF_STATE_T handleUFCompletedState( DIALYSIS_STATE_T *dialysisState )
-{
-    UF_STATE_T result = UF_RUNNING_STATE;  // TODO - remove this state and handler
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSalineBolusIdleState function handles the idle state of the
  * saline bolus state machine.
  * @details Inputs: none