Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r981de1f5228152ec6877aceae3d66ebf5efc7101 -rbb114842e73659f097bb8b8ec0d670bfa4f8cb73
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 981de1f5228152ec6877aceae3d66ebf5efc7101)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision bb114842e73659f097bb8b8ec0d670bfa4f8cb73)
@@ -97,8 +97,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 );
@@ -577,17 +575,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;
     }
 
@@ -647,16 +637,9 @@
 {
     UF_STATE_T result;
 
-    if ( maxUFVolumeML < NEARLY_ZERO )
-    {
-        result = UF_OFF_STATE;
-    }
-    else
-    {
-        lastUFTimeStamp = getMSTimerCount();
-        uFTimeMS = 0;
-        result = UF_RUNNING_STATE;
-    }
+    lastUFTimeStamp = getMSTimerCount();
+    uFTimeMS = 0;
+    result = UF_RUNNING_STATE;
 
     return result;
 }
@@ -735,42 +718,9 @@
     // If we have reached target UF volume, UF is complete
     if ( measUFVolume >= maxUFVolumeML )
     {
-        result = UF_COMPLETED_STATE;
+        setUFRate = 0.0;
     }
-    // Handle saline bolus start request from user
-    else if ( TRUE == salineBolusStartRequested )
-    {
-        if ( SALINE_BOLUS_STATE_IDLE == currentSalineBolusState )
-        {
-            // Since we were doing UF prior to saline bolus, we want to auto-resume when done
-            salineBolusAutoResumeUF = TRUE;
-            // Go to UF paused state
-            result = UF_PAUSED_STATE;
-            // Go to saline bolus state
-            *dialysisState = DIALYSIS_SALINE_BOLUS_STATE;
-        }
-        else
-        {
-            salineBolusStartRequested = FALSE;
-        }
-    }
 
-    return result;
-}
-
-/*********************************************************************//**
- * @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_OFF_STATE;
-
     // Calculate UF volumes and provide to dialysate outlet pump controller
     updateUFVolumes();
 
@@ -794,40 +744,6 @@
 
 /*********************************************************************//**
  * @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_COMPLETED_STATE;
-
-    // Calculate UF volumes and provide to dialysate outlet pump controller
-    updateUFVolumes();
-
-    // Handle saline bolus start request from user
-    if ( TRUE == salineBolusStartRequested )
-    {
-        salineBolusAutoResumeUF = FALSE;
-        // Go to saline bolus state
-        if ( SALINE_BOLUS_STATE_IDLE == currentSalineBolusState )
-        {
-            *dialysisState = DIALYSIS_SALINE_BOLUS_STATE;
-        }
-        else
-        {
-            salineBolusStartRequested = FALSE;
-        }
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSalineBolusIdleState function handles the idle state of the
  * saline bolus state machine.
  * @details Inputs: none