Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r59ba490fab6349216bafef4c8438b1b97aaaddcd -r346e74cbf78fdf1ea7cd779103476e49c4ee190e
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 59ba490fab6349216bafef4c8438b1b97aaaddcd)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 346e74cbf78fdf1ea7cd779103476e49c4ee190e)
@@ -8,7 +8,7 @@
 * @file    ModeTreatment.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      19-Jul-2023
+* @date    (last)      17-Jul-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -767,14 +767,7 @@
     // Update treatment time (unless delivering a saline bolus)
     if ( dialysisState != DIALYSIS_SALINE_BOLUS_STATE )
     {
-#ifdef DIALYZER_REPRIME_ENABLED
-        if ( dialysisState != DIALYSIS_DIALYZER_REPRIME_STATE )
-        {
-#endif
         treatmentTimeMS += msSinceLast;
-#ifdef DIALYZER_REPRIME_ENABLED
-        }
-#endif
     }
     lastTreatmentTimeStamp = newTime;
 
@@ -948,6 +941,7 @@
     // Handle signals from treatment re-circ sub-mode
     if ( TRUE == rinsebackToStoppedRequest )
     {
+        stopDialysis();
         transitionToTreatmentStop();
         result = TREATMENT_STOP_STATE;
     }
@@ -1453,11 +1447,6 @@
         payload.txEndState = getCurrentTreatmentEndState();
         payload.heparinState = getHeparinState();
         payload.dialysisState = getDialysisState();
-#ifdef DIALYZER_REPRIME_ENABLED
-        payload.dlzReprimeState = getDialyzerRePrimeState();
-#else
-        payload.dlzReprimeState = 0;
-#endif
 
         broadcastData( MSG_ID_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( TREATMENT_STATE_DATA_T ) );
         treatmentStateBroadcastTimerCtr = 0;