Index: NVDataMgmt.c
===================================================================
diff -u -r450808d34f407f1f75f83241f1da535f6c4ca2f0 -re865487e2b48d708713b2bcce3d03f378a3d5207
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 450808d34f407f1f75f83241f1da535f6c4ca2f0)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision e865487e2b48d708713b2bcce3d03f378a3d5207)
@@ -176,7 +176,6 @@
 // Private functions
 
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestStart ( void );
-static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadBootloaderFlag ( void );    // TODO: REMOVE THIS FUNCTION
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadLogRecord ( void );
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadMfgRecord ( void );
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadCalibrationRecord ( void );
@@ -554,42 +553,6 @@
 }
 
 /*************************************************************************
- * @brief handleSelfTestReadBootloaderFlag
- * The handleSelfTestReadBootloaderFlag reads the bootloader flag
- * from RTC RAM
- * @details
- * Inputs : none
- * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
- * @return NVDATAMGMT_SELF_TEST_STATE_T
- *************************************************************************/
-static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadBootloaderFlag ( void )
-{
-    NVDATAMGMT_SELF_TEST_STATE_T state;
-
-    if ( isServiceOnEntry && getRTCRAMState() == RTC_RAM_STATE_READY )
-    {
-        readFromRAM( BOOTLOADER_FLAG_ADDRESS, BOOTLOADER_FLAG_LENGTH_BYTES );
-        isServiceOnEntry= FALSE;
-    }
-    if ( getRTCRAMStatus() == RTC_RAM_STATUS_IDLE )
-    {
-        U08 i;
-        U32 tempValue;
-        getDataFromRAM( readBuffer, BOOTLOADER_FLAG_LENGTH_BYTES );
-        for ( i = 0; i < BOOTLOADER_FLAG_LENGTH_BYTES; i++ )
-        {
-            tempValue =  readBuffer [ i ] << i * SHIFT_8_BITS_FOR_BYTE_SHIFT;
-            bootloaderFlag = bootloaderFlag + tempValue;
-        }
-        state = NVDATAMGMT_SELF_TEST_STATE_READ_LOG_RECORD;
-        isServiceOnEntry= TRUE;
-    }
-
-    //return state;
-}
-
-/*************************************************************************
  * @brief handleSelfTestReadLogRecord
  * The handleSelfTestReadLogRecord reads the log record from RTC RAM
  * @details