Index: firmware/App/Services/CommBuffers.h
===================================================================
diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -r88b7f489c8da945997f1516600a30032393f5088
--- firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision eff7b1575f008f81b29ef906f6346fac6012d3ab)
+++ firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 88b7f489c8da945997f1516600a30032393f5088)
@@ -24,16 +24,12 @@
 typedef enum Comm_Buffers
 {
     COMM_BUFFER_NOT_USED = 0,           // CAN message boxes start at 1
-    COMM_BUFFER_OUT_CAN_HD_ALARM,
-    COMM_BUFFER_IN_CAN_DG_ALARM,
-    COMM_BUFFER_IN_CAN_UI_ALARM,
-    COMM_BUFFER_OUT_CAN_HD_2_DG,
-    COMM_BUFFER_IN_CAN_DG_2_HD,
-    COMM_BUFFER_OUT_CAN_HD_2_UI,
-    COMM_BUFFER_OUT_CAN_HD_BROADCAST,
-    COMM_BUFFER_IN_CAN_DG_BROADCAST,
-    COMM_BUFFER_IN_CAN_UI_2_HD,
-    COMM_BUFFER_IN_CAN_UI_BROADCAST,
+    COMM_BUFFER_OUT_CAN_DG_ALARM,
+    COMM_BUFFER_IN_CAN_HD_2_DG,
+    COMM_BUFFER_OUT_CAN_DG_2_HD,
+    COMM_BUFFER_OUT_CAN_DG_BROADCAST,
+    COMM_BUFFER_IN_CAN_PC_2_DG,
+    COMM_BUFFER_OUT_CAN_DG_2_PC,
     COMM_BUFFER_IN_UART_PC,
     COMM_BUFFER_OUT_UART_PC,
     NUM_OF_COMM_BUFFERS