Index: MsgDefs.h
===================================================================
diff -u -r74900728e3729be88f2581bb2ff03a978b6a46cb -r3573f9c29fe5971cc05dcd6d40928f8e94eb5fc7
--- MsgDefs.h	(.../MsgDefs.h)	(revision 74900728e3729be88f2581bb2ff03a978b6a46cb)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 3573f9c29fe5971cc05dcd6d40928f8e94eb5fc7)
@@ -207,14 +207,9 @@
     MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF,                          ///< TD tube set authentication acknowledge response
     MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB0,                                             ///< TD broadcast of syringe pump data
     MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB1,                                  ///< TD response to pause/resume Heparin delivery request
-    MSG_ID_TD_TUBING_SET_BARCODE_SCAN_REQUEST = 0xAE,                               ///< TD tube set authentication request
-    MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF,                               ///< UI tube set authentication acknowledge request
-    MSG_ID_TD_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0,                          ///< TD tube set authentication acknowledge response
-    MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1,                                             ///< TD broadcast of syringe pump data
-    MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2,                                  ///< TD response to pause/resume Heparin delivery request
-    MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3,                                   ///< FFU signal TD update is available.
-    MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4,                                   ///< FFU signal DD update is available.
-    MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5,                                        ///< DD substitution pump broadcast data.
+    MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB2,                                   ///< FFU signal TD update is available.
+    MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB3,                                   ///< FFU signal DD update is available.
+    MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB4,                                        ///< DD substitution pump broadcast data.
 
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID