Index: dialin/common/msg_defs.py
===================================================================
diff -u -r3a5030c08d57bddc2c22dca05d1070375e3cb5f7 -re8afa8d6323ede293e1fb094a461555fcf7ce0d9
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 3a5030c08d57bddc2c22dca05d1070375e3cb5f7)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision e8afa8d6323ede293e1fb094a461555fcf7ce0d9)
@@ -195,8 +195,6 @@
     MSG_ID_HD_SET_CALIBRATION_RECORD = 0x803D                   # HD set calibration_record record that is received from Dialin
     MSG_ID_HD_GET_CALIBRATION_RECORD = 0x803E                   # HD get calibration_record record that is requested from Dialin
     MSG_ID_HD_SEND_CALIBRATION_RECORD = 0x803F                  # HD send calibration_record record to CAN bus to be received in Dialin (equivalent to publish)
-    MSG_ID_HD_REQUEST_CALIBRATION_DATA = 0x803B                 # Requests calibration data from HD
-    MSG_ID_HD_ERASE_CALIBRATION_DATA = 0x803C                   # Requests calibration data on HD be erased
     MSG_ID_HD_SET_SYSTEM_RECORD = 0x8040                        # HD set system record that is received from Dialin
     MSG_ID_HD_GET_SYSTEM_RECORD = 0x8041                        # HD get system record that is requested from Dialin
     MSG_ID_HD_SEND_SYSTEM_RECORD = 0x8042                       # HD send system record to CAN bus to be received in Dialin (equivalent to publish)
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r3a5030c08d57bddc2c22dca05d1070375e3cb5f7 -re8afa8d6323ede293e1fb094a461555fcf7ce0d9
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 3a5030c08d57bddc2c22dca05d1070375e3cb5f7)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision e8afa8d6323ede293e1fb094a461555fcf7ce0d9)
@@ -16,14 +16,13 @@
 import struct
 from .accelerometer import DGAccelerometer
 from .alarms import DGAlarms
-from .calibration import DGCalibration
 from .concentrate_pumps import ConcentratePumps
 from .conductivity_sensors import ConductivitySensors
 from .drain_pump import DGDrainPump
 from .fans import Fans
 from .hd_proxy import DGHDProxy
 from .heaters import Heaters
-from .heat_disinfection import HeatDisinfection
+from .heat_disinfect import HeatDisinfect
 from .load_cells import DGLoadCells
 from .pressures import DGPressures
 from .reservoirs import DGReservoirs
@@ -142,14 +141,12 @@
         # Create command groups
         self.accel = DGAccelerometer(self.can_interface, self.logger)
         self.alarms = DGAlarms(self.can_interface, self.logger)
-        self.calibration = DGCalibration(self.can_interface, self.logger)
         self.concentrate_pumps = ConcentratePumps(self.can_interface, self.logger)
         self.conductivity_sensors = ConductivitySensors(self.can_interface, self.logger)
         self.drain_pump = DGDrainPump(self.can_interface, self.logger)
         self.fans = Fans(self.can_interface, self.logger)
         self.hd_proxy = DGHDProxy(self.can_interface, self.logger)
         self.heaters = Heaters(self.can_interface, self.logger)
-        self.heat_disinfect = HeatDisinfection(self.can_interface, self.logger)
         self.load_cells = DGLoadCells(self.can_interface, self.logger)
         self.pressures = DGPressures(self.can_interface, self.logger)
         self.reservoirs = DGReservoirs(self.can_interface, self.logger)
Index: tests/test_dg_records.py
===================================================================
diff -u -rdd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37 -re8afa8d6323ede293e1fb094a461555fcf7ce0d9
--- tests/test_dg_records.py	(.../test_dg_records.py)	(revision dd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37)
+++ tests/test_dg_records.py	(.../test_dg_records.py)	(revision e8afa8d6323ede293e1fb094a461555fcf7ce0d9)
@@ -76,9 +76,9 @@
         exit(1)
     sleep(2)
 
-    #process_calibration_record(read=False)
+    process_calibration_record(read=False)
     #process_system_record(read=True)
-    process_service_record(read=False)
+    #process_service_record(read=False)