Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r93383819b0f9b7bb0be3acb95f368ee6b8d8080a -r4e4ab946c0bc4b668cf5b197c7f841355814ccf5
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 93383819b0f9b7bb0be3acb95f368ee6b8d8080a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4e4ab946c0bc4b668cf5b197c7f841355814ccf5)
@@ -111,10 +111,6 @@
 static U32 timeOfLastUICheckIn = 0;                                         ///< Last time UI checked in
 static volatile BOOL uiDidCommunicate = FALSE;                              ///< Has UI every sent a message
 
-#ifdef EMC_TEST_BUILD
-    static U32 badCANCount; // Test code in support of EMC testing
-#endif
-
 // ********** private function prototypes **********
 
 static void clearCANXmitBuffers( void );
@@ -232,7 +228,11 @@
  * @return TRUE if UI has communicated since power up, FALSE if not
  *************************************************************************/
 BOOL uiCommunicated( void )
-{
+{
+#ifdef SIMULATE_UI
+    uiDidCommunicate = TRUE;
+#endif
+
     return uiDidCommunicate;
 }
 
@@ -591,10 +591,6 @@
                 else if ( -1 == msgSize ) // Candidate message with bad CRC found?
                 {
                     badCRCDetected = TRUE;
-#ifdef EMC_TEST_BUILD
-                    badCANCount++;
-                    broadcastCANErrorCount( badCANCount );
-#endif
                     getFromCommBuffer( MSG_IN_BUFFERS[ i ], data, 1 );  // Consume sync byte so we can re-sync
                     messagesInBuffer = TRUE;  // Keep processing this buffer
                 } // Looks like there is a complete message in the comm buffer
@@ -729,10 +725,6 @@
             }
             else // CRC failed
             {
-#ifdef EMC_TEST_BUILD
-                badCANCount++;
-                broadcastCANErrorCount( badCANCount );
-#endif
                 checkTooManyBadMsgCRCs();
             }
         }