Index: firmware/App/Services/NVMsgQ.h
===================================================================
diff -u -rb878faee61a0800b767d053ab3f65afb3790dacb -rf525d2be1e7038cacbe2bb34b8db3505cf26a350
--- firmware/App/Services/NVMsgQ.h	(.../NVMsgQ.h)	(revision b878faee61a0800b767d053ab3f65afb3790dacb)
+++ firmware/App/Services/NVMsgQ.h	(.../NVMsgQ.h)	(revision f525d2be1e7038cacbe2bb34b8db3505cf26a350)
@@ -43,6 +43,7 @@
 #define INSTIT_RECORD_NV_MEM_START_ADDRESS       ( BANK7_SECTOR2_START_ADDRESS + INSTIT_RECORD_OFFSET )
 #define USAGE_INFO_START_ADDRESS                 ( BANK7_SECTOR3_START_ADDRESS + USAGE_RECORD_OFFSET )          ///< DD usage info start address in RTC RAM (48).
 
+#define MIN_JOBS_NEEDED_FOR_A_RECORD             4                                                              ///< Min queue count needed to erase and write a sector
 #define MIN_JOBS_NEEDED_FOR_ALL_RECORDS          ( NUM_OF_NVDATMGMT_RECORDS_JOBS * 2 )                          ///< Min queue count needed to erase and write all records
 
 /// NVDataMgmt records read status
@@ -66,15 +67,11 @@
 BOOL isRecordQueueEmpty( void );
 BOOL isRecordQueueFull( void );
 U32  getAvailableRecordQueueCount( void );
-BOOL enqueueSector0Records( void );
+
+BOOL enqueueEraseAndWriteSector( RECORD_JOBS_STATE_T job );
 void enqueuePOSTReadRecords( void );
 
-BOOL enqueueNVMReceiveRecord( RECORD_JOBS_STATE_T job, U32 currentMessage, U32 totalMessages, U32 length, U08 *payloadPtr );
-
 BOOL testDDGetNVRecord( MESSAGE_T *message );
-BOOL testDDSetNVRecord( MESSAGE_T *message );
-void handleSendInstitutionalRecordToUI( MESSAGE_T* message );
-BOOL receiveRecordFromDialin( RECORD_JOBS_STATE_T job, U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
 BOOL isNewCalibrationRecordAvailable( void );
 
 void updateNewNVRecordAvailableFlag( BOOL value );