Index: NVDataMgmt.c
===================================================================
diff -u -rc684d4e9dfc769d27435dbcb4086c3829b8249a8 -rd718ea7ffba79798f77fac05072495bef8ab5ece
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision c684d4e9dfc769d27435dbcb4086c3829b8249a8)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d718ea7ffba79798f77fac05072495bef8ab5ece)
@@ -443,11 +443,11 @@
 static DG_HEATERS_INFO_GROUP_T      dgHeatersInfoGroup;                                                         ///< DG heaters info structure (including padding and final CRC).
 #ifndef _RELEASE_
 static DG_SW_CONFIG_GROUP_T         dgSWConfigGroup;                                                            ///< DG Software configurations structure(including padding and final CRC).
+#endif
 
 // TODO this is temporary until it is added to the cal records
 static DG_CHEMICALS_FILL_COND_CAL_RECORD_T tempChemsRecordRemove;
 // TODO this is temporary until it is added to the cal records
-#endif
 
 // Process records specifications
 const PROCESS_RECORD_SPECS_T RECORDS_SPECS[ NUM_OF_NVDATMGMT_RECORDS_JOBS ] =  {
Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -ra5db7d73152f5d7bfccd5a565ef2cddaf61825ef -rd718ea7ffba79798f77fac05072495bef8ab5ece
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision a5db7d73152f5d7bfccd5a565ef2cddaf61825ef)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision d718ea7ffba79798f77fac05072495bef8ab5ece)
@@ -160,7 +160,6 @@
     CAL_DATA_CPO_COND_SENSOR,                                                                                  ///< CPo conductivity sensor.
     CAL_DATA_CD1_COND_SENSOR,                                                                                  ///< CD1 conductivity sensor.
     CAL_DATA_CD2_COND_SENSOR,                                                                                  ///< CD2 conductivity sensor.
-    CAL_DATA_CD1_COND_SENSOR_CHEM_DISINFECT,                                                                   ///< CD1 chemical disinfect conductivity sensor.
     CAL_DATA_CD2_COND_SENSOR_CHEM_DISINFECT,                                                                   ///< CD2 chemical disinfect conductivity sensor.
     CAL_DATA_CD2_COND_SENSOR_FILL_BICARB_TEST,                                                                 ///< CD2 conductivity sensor fill bicarb test.
     NUM_OF_CAL_DATA_COND_SENSORS,                                                                              ///< Number of conductivity sensors.