Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7 -r383c4be0d9ad14570c87cf5b7330f5f83d92383e
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 383c4be0d9ad14570c87cf5b7330f5f83d92383e)
@@ -647,25 +647,25 @@
  * @param newMode ID of requested mode to transition to
  * @return TRUE if request successful, FALSE if not
  *************************************************************************/
-BOOL testSetOperationMode( TD_OP_MODE_T newMode )
-{
-    BOOL result = FALSE;
+//BOOL testSetOperationMode( TD_OP_MODE_T newMode )
+//{
+//    BOOL result = FALSE;
+//
+//    if ( TRUE == isTestingActivated() )
+//    {
+//        TD_OP_MODE_T check = MODE_TRANSITION_TABLE[ currentMode ][ newMode ];
+//
+//        // Is mode transition legal?
+//        if ( check == newMode )
+//        {
+//            requestNewOperationMode( newMode );
+//            result = TRUE;
+//        }
+//    }
+//
+//    return result;
+//}
 
-    if ( TRUE == isTestingActivated() )
-    {
-        TD_OP_MODE_T check = MODE_TRANSITION_TABLE[ currentMode ][ newMode ];
-
-        // Is mode transition legal?
-        if ( check == newMode )
-        {
-            requestNewOperationMode( newMode );
-            result = TRUE;
-        }
-    }
-
-    return result;
-}
-
 /*********************************************************************//**
  * @brief
  * The testSetOpModePublishIntervalOverride function sets the override of the
@@ -675,42 +675,20 @@
  * @param ms milliseconds between operation mode broadcasts
  * @return TRUE if override set successful, FALSE if not
  *************************************************************************/
-BOOL testSetOpModePublishIntervalOverride( U32 ms )
-{
-    BOOL result = FALSE;
+//BOOL testSetOpModePublishIntervalOverride( U32 ms )
+//{
+//    BOOL result = FALSE;
+//
+//    if ( TRUE == isTestingActivated() )
+//    {
+//        U32 intvl = ms / TASK_GENERAL_INTERVAL;
+//
+//        result = TRUE;
+//        opModePublishInterval.ovData = intvl;
+//        opModePublishInterval.override = OVERRIDE_KEY;
+//    }
+//
+//    return result;
+//}
 
-    if ( TRUE == isTestingActivated() )
-    {
-        U32 intvl = ms / TASK_GENERAL_INTERVAL;
-
-        result = TRUE;
-        opModePublishInterval.ovData = intvl;
-        opModePublishInterval.override = OVERRIDE_KEY;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testResetOpModePublishIntervalOverride function resets the override of the
- * operation mode data publication interval.
- * @details \b Inputs: none
- * @details \b Outputs: opModePublishInterval
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetOpModePublishIntervalOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        opModePublishInterval.override = OVERRIDE_RESET;
-        opModePublishInterval.ovData = opModePublishInterval.ovInitData;
-    }
-
-    return result;
-}
-
 /**@}*/