Index: NVDataMgmt.c
===================================================================
diff -u -rdeb096f8b15b9bca15437328095c51cd2549d743 -r209db62b6db6f91beb261bf79deccc9ac90b3484
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision deb096f8b15b9bca15437328095c51cd2549d743)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 209db62b6db6f91beb261bf79deccc9ac90b3484)
@@ -908,6 +908,7 @@
                         BOOL scheduleStatus = enqueueSector0Records();
 
                         // Signal that there is a new calibration record available.
+                        // NOTE: as of now, this signal will be sent even after the system record is sent
                         newCalStartTimer    = getMSTimerCount();
                         isNewCalAvailable   = TRUE;
                     }
@@ -1236,12 +1237,7 @@
     value = dgSWConfigGroup.dgSWConfigsRecord.swConfigs[ config ];
 #endif
 #ifdef _HD_
-    HD_OP_MODE_T opMode = getCurrentOperationMode();
-
-   if ( ( MODE_FAUL == opMode ) || ( MODE_SERV == opMode ) || ( MODE_STAN == opMode ) )
-   {
-       value = hdSWConfigGroup.hdSWConfigsRecord.swConfigs[ config ];
-   }
+   value = hdSWConfigGroup.hdSWConfigsRecord.swConfigs[ config ];
 #endif
 #endif