Index: dialin/common/msg_defs.py
===================================================================
diff -u -r8ba3986f8fe9ef801c9f592a37f90933effbd34d -r817f108b234f6652fecbda170dcaae9636feec7b
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 8ba3986f8fe9ef801c9f592a37f90933effbd34d)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 817f108b234f6652fecbda170dcaae9636feec7b)
@@ -20,8 +20,6 @@
 # Define msg ids that are not yet added to common but are needed in dialin
 @unique
 class MsgIdsDialin(DialinEnum):
-    MSG_DIALIN_ID_HD_SERIAL_NUMBER_RESPONSE = 0X87
-    MSG_DIALIN_ID_DG_SERIAL_NUMBER_RESPONSE = 0X88
     MSG_DIALIN_ID_UI_SYSTEM_USAGE_REQUEST   = 0x89
     MSG_DIALIN_ID_HD_SYSTEM_USAGE_RESPONSE  = 0x8A
     MSG_DIALIN_ID_DG_SYSTEM_USAGE_RESPONSE  = 0x8C
Index: dialin/hd/alarms.py
===================================================================
diff -u -r0f4ba40a63c79697d979203f67ef0338a12cae23 -r817f108b234f6652fecbda170dcaae9636feec7b
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 0f4ba40a63c79697d979203f67ef0338a12cae23)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 817f108b234f6652fecbda170dcaae9636feec7b)
@@ -49,11 +49,11 @@
     END_POS_ALARM_STATE = START_POS_ALARM_STATE + 4
     START_POS_ALARM_TOP = END_POS_ALARM_STATE
     END_POS_ALARM_TOP = START_POS_ALARM_TOP + 4
-    START_POS_ALARM_SILENCE_EXPIRES_IN = END_POS_ALARM_TOP
-    END_POS_ALARM_SILENCE_EXPIRES_IN = START_POS_ALARM_SILENCE_EXPIRES_IN + 4
-    START_POS_ALARM_ESCALATES_IN = END_POS_ALARM_SILENCE_EXPIRES_IN
+    START_POS_ALARM_ESCALATES_IN = END_POS_ALARM_TOP
     END_POS_ALARM_ESCALATES_IN = START_POS_ALARM_ESCALATES_IN + 4
-    START_POS_ALARMS_FLAGS = END_POS_ALARM_ESCALATES_IN
+    START_POS_ALARM_SILENCE_EXPIRES_IN = END_POS_ALARM_ESCALATES_IN
+    END_POS_ALARM_SILENCE_EXPIRES_IN = START_POS_ALARM_SILENCE_EXPIRES_IN + 4
+    START_POS_ALARMS_FLAGS = END_POS_ALARM_SILENCE_EXPIRES_IN
     END_POS_ALARMS_FLAGS = START_POS_ALARMS_FLAGS + 2
 
     START_POS_ALARM_ID = DenaliMessage.PAYLOAD_START_INDEX
@@ -201,12 +201,12 @@
         self.alarm_top = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_TOP:self.END_POS_ALARM_TOP]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.alarms_silence_expires_in = int.from_bytes(bytearray(
-            message['message'][self.START_POS_ALARM_SILENCE_EXPIRES_IN:self.END_POS_ALARM_SILENCE_EXPIRES_IN]),
-            byteorder=DenaliMessage.BYTE_ORDER)
         self.alarms_escalates_in = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_ESCALATES_IN:self.END_POS_ALARM_ESCALATES_IN]),
             byteorder=DenaliMessage.BYTE_ORDER)
+        self.alarms_silence_expires_in = int.from_bytes(bytearray(
+            message['message'][self.START_POS_ALARM_SILENCE_EXPIRES_IN:self.END_POS_ALARM_SILENCE_EXPIRES_IN]),
+            byteorder=DenaliMessage.BYTE_ORDER)
         self.alarms_flags = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARMS_FLAGS:self.END_POS_ALARMS_FLAGS]),
             byteorder=DenaliMessage.BYTE_ORDER)
Index: dialin/ui/dg_simulator.py
===================================================================
diff -u -r46342bac3e23428e90666525bb5a89c4532da945 -r817f108b234f6652fecbda170dcaae9636feec7b
--- dialin/ui/dg_simulator.py	(.../dg_simulator.py)	(revision 46342bac3e23428e90666525bb5a89c4532da945)
+++ dialin/ui/dg_simulator.py	(.../dg_simulator.py)	(revision 817f108b234f6652fecbda170dcaae9636feec7b)
@@ -464,7 +464,7 @@
         payload = b'0123456789\0'
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_ui_ch_id,
-                                              message_id=MsgIdsDialin.MSG_DIALIN_ID_DG_SERIAL_NUMBER_RESPONSE.value,
+                                              message_id=MsgIds.MSG_ID_DG_SERIAL_NUMBER.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r8ba3986f8fe9ef801c9f592a37f90933effbd34d -r817f108b234f6652fecbda170dcaae9636feec7b
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 8ba3986f8fe9ef801c9f592a37f90933effbd34d)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 817f108b234f6652fecbda170dcaae9636feec7b)
@@ -1429,7 +1429,7 @@
         payload = bytearray('0123456789\0', encoding="utf-8")
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
-                                              message_id=MsgIdsDialin.MSG_DIALIN_ID_HD_SERIAL_NUMBER_RESPONSE.value,
+                                              message_id=MsgIds.MSG_ID_HD_SERIAL_NUMBER.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
Index: tools/build_common_defs.py
===================================================================
diff -u -r0514a69831286e4727429f57e046f71e73e78110 -r817f108b234f6652fecbda170dcaae9636feec7b
--- tools/build_common_defs.py	(.../build_common_defs.py)	(revision 0514a69831286e4727429f57e046f71e73e78110)
+++ tools/build_common_defs.py	(.../build_common_defs.py)	(revision 817f108b234f6652fecbda170dcaae9636feec7b)
@@ -13,7 +13,6 @@
 # @date (original) 05-Apr-2021
 #
 ############################################################################
-import heapq
 import os
 import subprocess
 from datetime import datetime
@@ -71,7 +70,6 @@
             print("Error reading in txt file: {0}".format(e))
             return False
 
-        # TODO: match fw order
         current_time = datetime.now()
         
         code_header = \