Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r05f42ecd223cf512e9e8f3434dd01bdac3aca86d -r4d1572f8226f06febef4a536cdd0946d0dd0fb02
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 05f42ecd223cf512e9e8f3434dd01bdac3aca86d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
@@ -98,7 +98,6 @@
     data[ msgSize++ ] = MESSAGE_SYNC_BYTE;
 
     // set sequence # and ACK bit (unless this is an ACK to a received message)
-#ifndef ACK_NOT_IMPLEMENTED
     if ( msg.hdr.msgID != MSG_ID_ACK )
     {
         // thread protect next sequence # access & increment
@@ -111,7 +110,6 @@
             msg.hdr.seqNo *= -1;
         }
     }
-#endif
 
     // calculate message CRC
     crc = crc8( (U08*)(&msg), sizeof( MESSAGE_HEADER_T ) + msg.hdr.payloadLen );
@@ -135,7 +133,6 @@
         data[ msgSize++ ] = 0;
     }
 
-#ifndef ACK_NOT_IMPLEMENTED
     // if ACK required, add to pending ACK list
     if ( TRUE == ackReq )
     {
@@ -145,7 +142,6 @@
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
         }
     }
-#endif
 
     if ( FALSE == error )
     {
@@ -156,7 +152,6 @@
     return result;
 }
 
-#ifndef ACK_NOT_IMPLEMENTED
 /*************************************************************************
  * @brief sendACKMsg
  * The sendACKMsg function constructs and queues for transmit an ACK message \n
@@ -186,7 +181,6 @@
 
     return result;
 }
-#endif
 
 // ***********************************************************************
 // ********************* MSG_ID_OFF_BUTTON_PRESS *************************
@@ -400,6 +394,7 @@
  * @param len : # of bytes of debug data
  * @return TRUE if debug data was successfully queued for transmit, FALSE if not
  *************************************************************************/
+#ifdef DEBUG_ENABLED
 BOOL sendDebugData( U08 *dbgData, U32 len )
 {
     BOOL result;
@@ -409,6 +404,7 @@
 
     return result;
 }
+#endif
 
 /*************************************************************************
  * @brief isTestingActivated