Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r53eaeea39c88b1894a6b2d7b5c2733fbf037e0da -r279a41c031010740e5121ea978d8f069a4b7deb7
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 53eaeea39c88b1894a6b2d7b5c2733fbf037e0da)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 279a41c031010740e5121ea978d8f069a4b7deb7)
@@ -675,77 +675,4 @@
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The testConductivitySensorReadingsOverride function overrides the value of the
- * specified conductivity sensor with a given value and determines which driver
- * override.
- * @details \b Inputs: testConfig
- * @details \b Outputs: none
- * @param message Override message from Dialin which includes an sensor
- * ID and override value of the conductivity sensor.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload );
-
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
-    {
-        result = testConductivitySensorConductivityReadingsOverride( message );
-    }
-    else
-    {
-
-        if ( payload.index != D74_COND )
-        {
-            result = testTeensyConductivitySensorReadingsOverride( message );
-        }
-        else
-        {
-            result = testConductivitySensorReadingsOverride( message );
-        }
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testConductivitySensorTemperatureOverride function overrides the value of the
- * specified conductivity sensor with a given value and determines which driver
- * override.
- * @details \b Inputs: testConfig
- * @details \b Outputs: none
- * @param message Override message from Dialin which includes an sensor
- * ID and override value of the conductivity sensor.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testConductivitySensorTemperatureOverride( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload );
-
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
-    {
-        result = testConductivitySensorTemperatureReadingsOverride( message );
-    }
-    else
-    {
-
-        if ( payload.index != D74_COND )
-        {
-            result = testTeensyConductivitySensorTemperatureReadingsOverride( message );
-        }
-        else
-        {
-            result = testConductivitySensorTemperatureReadingsOverride( message );
-        }
-    }
-
-    return result;
-}
 /**@}*/