Index: NVDataMgmt.h
===================================================================
diff -u -rf2a92b265b295e93b57199a89d6491e195f74c56 -rab745156d182ac1ee04a98aa2b2af0f30c8894e6
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision f2a92b265b295e93b57199a89d6491e195f74c56)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision ab745156d182ac1ee04a98aa2b2af0f30c8894e6)
@@ -59,33 +59,7 @@
 } NVDATAMGMT_READ_STATUS_T;
 
 #pragma pack(push, 1)
-/********************** OLD STRUCTS TODO REMOVE ******************/
-/// Payload record structure for a linear calibration message. TODO remove
-typedef struct
-{
-    F32 gain;
-    F32 offset;
-} LINEAR_F32_CAL_PAYLOAD_T;
-// TODO remove the above structure
 
-/// Calibration data structure.
-typedef struct calibration_Data
-{
-    U32 calRecordRevision;                                      ///< Revision of calibration record (rev when structure changes to determine compatibility with f/w version)
-    F32 accelXOffset;                                           ///< Accelerometer X axis offset
-    F32 accelYOffset;                                           ///< Accelerometer Y axis offset
-    F32 accelZOffset;                                           ///< Accelerometer Z axis offset
-#ifdef _HD_
-    F32 bloodFlowGain;                                          ///< Gain for blood flow sensor
-    F32 bloodFlowOffset_mL_min;                                 ///< Offset for blood flow sensor
-    F32 dialysateFlowGain;                                      ///< Gain for dialysate flow sensor
-    F32 dialysateFlowOffset_mL_min;                             ///< Offset for dialysate flow sensor
-#endif
-    //char calDateAccel[ MAX_DATE_CHARACTERS ];                   ///< Last calibration date of accelerometer
-} CALIBRATION_DATA_T;
-
-/********************** TODO OLD STRUCT REMOVE ******************/
-
 /// Read data status structure.
 typedef struct get_data
 {
@@ -157,12 +131,10 @@
 HD_TEMP_SENSORS_CAL_RECORD_T         getHDTemperatureSensorsCalibrationRecord( void );
 HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T getHDHeparinForceSensorCalibrationRecord( void );
 HD_ACCELEROMETER_SENSOR_CAL_RECORD_T getHDAccelerometerSensorCalibrationRecord( void );
+HD_SYSTEM_RECORD_T                   getHDSystemRecord( void );
+HD_SERVICE_RECORD_T                  getHDServiceRecord( void );
 #endif
 
-BOOL setCalibrationData ( CALIBRATION_DATA_T data ); //TODO remove
-BOOL getCalibrationData ( CALIBRATION_DATA_T* buffer ); //TODO remove
-BOOL testResetCalibrationData( U32 key ); // TODO clean up
-
 BOOL setTreatmentTime ( U32 hours );
 U32  getTreatmentTime ( void );