Index: firmware/App/Services/SystemComm.h
===================================================================
diff -u -r6c60d0d0300828750c76f2e397d4e7ccaa84bbb2 -r2e6c750c202b7361d79488ce383e34f380e75413
--- firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 6c60d0d0300828750c76f2e397d4e7ccaa84bbb2)
+++ firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
@@ -26,24 +26,28 @@
 #define MESSAGE_SYNC_BYTE           0xA5
 
 #define CAN_MESSAGE_PAYLOAD_SIZE    8
-#define PC_MESSAGE_PACKET_SIZE      8
+#ifdef DEBUG_ENABLED
+    #define PC_MESSAGE_PACKET_SIZE  8
+#endif
 
 #define MSG_ID_ACK                  0xFFFF
 #define MSG_ACK_BIT                 0x8000
 #define MAX_MSG_SEQ_NO              0x7FFF
 #define MIN_MSG_SEQ_NO              0x0001
 #define MAX_ACK_MSG_SIZE            ( sizeof( MESSAGE_WRAPPER_T ) + 1 + CAN_MESSAGE_PAYLOAD_SIZE )  // must hold full (wrapped) message + sync + any CAN padding
 
-typedef COMM_BUFFER_T   CAN_MESSAGE_BOX_T;       // the first 12 comm buffers align with the 12 active CAN message boxes
+typedef COMM_BUFFER_T   CAN_MESSAGE_BOX_T;       // the CAN comm buffers align with the active CAN message boxes
 
 // ********** public function prototypes **********
 
 void initSystemComm( void );
 void execSystemCommRx( void );
 void execSystemCommTx( void );
 void handleCANMsgInterrupt( CAN_MESSAGE_BOX_T srcCANBox );
+#ifdef DEBUG_ENABLED
 void handleUARTMsgRecvPacketInterrupt( void );
 void handleUARTMsgXmitPacketInterrupt( void );
+#endif
 void checkInFromDG( void );
 void checkInFromUI( void );
 BOOL isDGCommunicating( void );