Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -r106bbf14432e48c0153ede862800fc3722935ede -r119ff7186b70a15f4b0957ea8951313b0f0be8c3
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 106bbf14432e48c0153ede862800fc3722935ede)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 119ff7186b70a15f4b0957ea8951313b0f0be8c3)
@@ -35,29 +35,6 @@
 #define MAX_TOP_LEVEL_PN_CHARS 10U                                                                             ///< Max number of characters for top level part number.
 #define MAX_TOP_LEVEL_SN_CHARS 20U                                                                             ///< Max number of characters for top level serial number.
 
-// Institutional record defaults
-#define DEFAULT_MIN_BLOOD_FLOW_MLPM                  100
-#define DEFAULT_MAX_BLOOD_FLOW_MLPM                  500
-#define DEFAULT_MIN_DIALYSATE_FLOW_MLPM              100
-#define DEFAULT_MAX_DIALYSATE_FLOW_MLPM              600
-#define DEFAULT_MIN_TX_DURATION_MIN                  60
-#define DEFAULT_MAX_TX_DURATION_MIN                  480
-#define DEFAULT_HEPARIN_ENABLE                       1
-#define DEFAULT_MIN_STOP_HEP_DISP_BEFORE_TX_END_MIN  0
-#define DEFAULT_MAX_STOP_HEP_DISP_BEFORE_TX_END_MIN  480
-#define DEFAULT_MIN_SALINE_BOLUS_VOLUME_ML           100
-#define DEFAULT_MAX_SALINE_BOLUS_VOLUME_ML           300
-#define DEFAULT_MIN_DIALYSATE_TEMPERATURE_C          35.0F
-#define DEFAULT_MAX_DIALYSATE_TEMPERATURE_C          37.0F
-#define DEFAULT_MIN_ART_PRESS_LIMIT_WINDOW_MMHG      120
-#define DEFAULT_MAX_ART_PRESS_LIMIT_WINDOW_MMHG      200
-#define DEFAULT_MIN_VEN_PRESS_LIMIT_WINDOW_MMHG      100
-#define DEFAULT_MAX_VEN_PRESS_LIMIT_WINDOW_MMHG      200
-#define DEFAULT_MIN_VEN_ASYM_PRESS_LIMIT_WINDOW_MMHG 20
-#define DEFAULT_MAX_VEN_ASYM_PRESS_LIMIT_WINDOW_MMHG 35
-#define DEFAULT_MIN_UF_VOLUME_L                      0.0F
-#define DEFAULT_MAX_UF_VOLUME_L                      8.0F
-
 #ifndef _RELEASE_
 /// Software configuration enums
 typedef enum software_configurations
@@ -298,21 +275,24 @@
     U32 maxDialysateFlowMLPM;
     U32 minTxDurationMIN;
     U32 maxTxDurationMIN;
-    U32 heparinEnable;
     U32 minStopHeparinDispBeforeTxEndMIN;
     U32 maxStopHeparinDispBeforeTxEndMIN;
     U32 minSalineBolusVolumeML;
     U32 maxSalineBolusVolumeML;
     F32 minDialysateTempC;
     F32 maxDialysateTempC;
-    U32 minArtPressLimitWindowMMHG;
-    U32 maxArtPressLimitWindowMMHG;
-    U32 minVenPressLimitWindowMMHG;
-    U32 maxVenPressLimitWindowMMHG;
-    U32 minVenAsymPressLimitMMHG;
-    U32 maxVenAsymPressLimitMMHG;
+    S32 minArtPressLimitWindowMMHG;
+    S32 maxArtPressLimitWindowMMHG;
+    S32 minVenPressLimitWindowMMHG;
+    S32 maxVenPressLimitWindowMMHG;
+    S32 minVenAsymPressLimitMMHG;
+    S32 maxVenAsymPressLimitMMHG;
     F32 minUFVolumeL;
     F32 maxUFVolumeL;
+    F32 minHeparinDispRateMLPM;
+    F32 maxHeparinDispRateMLPM;
+    F32 minHeparinBolusVolumeML;
+    F32 maxHeparinBolusVolumeML;
     U32 calibrationTime;
     U16 crc;
 } HD_INSTITUTIONAL_RECORD_T;