Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -rc2fe204db1b8926994b5eee78afa1b516c97d02c -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision c2fe204db1b8926994b5eee78afa1b516c97d02c)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
@@ -128,7 +128,6 @@
 static DRAIN_PUMP_STATE_T handleDrainPumpOpenLoopState( void );
 static void stopDrainPump( void );
 static void publishDrainPumpData( void );
-static U32 getPublishDrainPumpDataInterval( void );
 static BOOL processCalibrationData( void );
 
 /*********************************************************************//**
@@ -609,26 +608,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishDrainPumpDataInterval function gets the drain pump data
- * publication interval.
- * @details Inputs: drainPumpDataPublishInterval
- * @details Outputs: drainPumpDataPublishInterval
- * @return the current Drain pump data publication interval (in ms).
- *************************************************************************/
-static U32 getPublishDrainPumpDataInterval( void )
-{
-    U32 result = drainPumpDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == drainPumpDataPublishInterval.override )
-    {
-        result = drainPumpDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The publishDrainPumpData function publishes drain pump data at the set
  * interval.
  * @details Inputs: drainPumpDataPublicationTimerCounter
@@ -638,7 +617,7 @@
 static void publishDrainPumpData( void )
 {
     // publish Drain pump data on interval
-    if ( ++drainPumpDataPublicationTimerCounter >= getPublishDrainPumpDataInterval() )
+    if ( ++drainPumpDataPublicationTimerCounter >= getU32OverrideValue( &drainPumpDataPublishInterval ) )
     {
         DRAIN_PUMP_DATA_T drainPumpData;