Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rc65ad0538ff99c3e13d7d7866ac15e38a1ef6002 -r7a7bf19d0cf16745566956f45cef57f8eb5df445
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision c65ad0538ff99c3e13d7d7866ac15e38a1ef6002)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
@@ -53,7 +53,6 @@
 static TREATMENT_STOP_STATE_T handleTreatmentStopNoRecircState( void );
 
 static void publishTreatmentStopData( void );
-static U32 getPublishTreatmentStopInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -226,7 +225,7 @@
  *************************************************************************/
 static void publishTreatmentStopData( void )
 {
-    if ( ++stopPublishTimerCtr >= getPublishTreatmentStopInterval() )
+    if ( ++stopPublishTimerCtr >= getU32OverrideValue( &treatmentStopPublishInterval ) )
     {
         U32 timeout = MAX_TIME_BLOOD_SITTING  / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
         U32 countdown = ( bloodSittingTimerCtr >= MAX_TIME_BLOOD_SITTING ? 0 : ( MAX_TIME_BLOOD_SITTING - bloodSittingTimerCtr ) / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
@@ -236,27 +235,7 @@
     }
 }
 
-/*********************************************************************//**
- * @brief
- * The getPublishTreatmentStopInterval function gets the treatment stop sub-mode data
- * publication interval.
- * @details Inputs: treatmentStopPublishInterval
- * @details Outputs: none
- * @return the current treatment stop sub-mode publication interval (in task intervals).
- *************************************************************************/
-static U32 getPublishTreatmentStopInterval( void )
-{
-    U32 result = treatmentStopPublishInterval.data;
 
-    if ( OVERRIDE_KEY == treatmentStopPublishInterval.override )
-    {
-        result = treatmentStopPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/