Index: firmware/App/Services/SystemCommDD.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -recd204503f9f4837800080a58c07dac8a2e8d602
--- firmware/App/Services/SystemCommDD.c	(.../SystemCommDD.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Services/SystemCommDD.c	(.../SystemCommDD.c)	(revision ecd204503f9f4837800080a58c07dac8a2e8d602)
@@ -91,8 +91,10 @@
     // Initialize common system comm unit
     initSystemComm();
 
+#ifdef __BAD_MSG_CRC_ALARM_ENABLED__
     // initialize bad message CRC time windowed count
     initTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC, MAX_COMM_CRC_FAILURES, MAX_COMM_CRC_FAILURE_WINDOW_MS );
+#endif
 
     // initialize FPGA clock speed error time windowed count
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR, MAX_FPGA_CLOCK_SPEED_ERRORS, MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS);
@@ -268,10 +270,13 @@
  *************************************************************************/
 void checkTooManyBadMsgCRCs( void )
 {
+    //TODO: Remove this as this was my current system specific.
+#ifdef __BAD_MSG_CRC_ALARM_ENABLED__
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_COMM_TOO_MANY_BAD_CRCS, 2 );  // 2 for DD
     }
+#endif
 }
 
 /*********************************************************************//**