Index: NVJobQ.h
===================================================================
diff -u -re6aa2e0d144cd2620630e32a7091958a44ae158c -r06d361042a6a2d139b6ad03aeb1319de38821b59
--- NVJobQ.h	(.../NVJobQ.h)	(revision e6aa2e0d144cd2620630e32a7091958a44ae158c)
+++ NVJobQ.h	(.../NVJobQ.h)	(revision 06d361042a6a2d139b6ad03aeb1319de38821b59)
@@ -32,20 +32,6 @@
 
 // ********** public definitions **********
 
-#define NV_RECORD_SLOT_SIZE                      4096                                                        ///< Size of each NV record slot (4KB)
-
-#define SYSTEM_RECORD_OFFSET                     (0U * NV_RECORD_SLOT_SIZE)                                  ///< Offset of system record within sector
-#define SERVICE_RECORD_OFFSET                    (0U * NV_RECORD_SLOT_SIZE)                                  ///< Offset of service record within sector
-#define CAL_RECORD_OFFSET                        (1U * NV_RECORD_SLOT_SIZE)                                  ///< Offset of calibration record within sector
-#define INSTIT_RECORD_OFFSET                     (0U * NV_RECORD_SLOT_SIZE)                                  ///< Offset of institutional record within sector
-#define USAGE_RECORD_OFFSET                      (0U * NV_RECORD_SLOT_SIZE)                                  ///< Offset of usage record within sector
-
-#define SYSTEM_RECORD_NV_MEM_START_ADDRESS       ( BANK7_SECTOR0_START_ADDRESS + SYSTEM_RECORD_OFFSET )      ///< Start address of system record in NV memory
-#define SERVICE_RECORD_NV_MEM_START_ADDRESS      ( BANK7_SECTOR1_START_ADDRESS + SERVICE_RECORD_OFFSET )     ///< Start address of service record in NV memory
-#define CAL_RECORD_NV_MEM_START_ADDRESS          ( BANK7_SECTOR1_START_ADDRESS + CAL_RECORD_OFFSET )         ///< Start address of calibration record in NV memory
-#define INSTIT_RECORD_NV_MEM_START_ADDRESS       ( BANK7_SECTOR2_START_ADDRESS + INSTIT_RECORD_OFFSET )      ///< Start address of institutional record in NV memory
-#define USAGE_INFO_START_ADDRESS                 ( BANK7_SECTOR3_START_ADDRESS + USAGE_RECORD_OFFSET )       ///< Start address of usage info record in NV memory
-
 #define MAX_NUM_OF_RECORD_IN_A_SECTOR            2                                                           ///< Maximum number of records stored in one sector
 #define MIN_JOBS_NEEDED_TO_WRITE_A_RECORD        ( MAX_NUM_OF_RECORD_IN_A_SECTOR * 2 )                       ///< Minimum queue jobs to erase and write one record
 #define MIN_JOBS_NEEDED_TO_WRITE_ALL_RECORDS     ( NUM_OF_NVM_RECORD_TYPES * 2 )                             ///< Minimum queue jobs to erase and write all records