Index: firmware/App/Services/Download.c
===================================================================
diff -u -r893caf9f58a08a2bd31068806e09603041d64add -r9e2779d825ea7e7b3445fa365f7bc2206fc0613a
--- firmware/App/Services/Download.c	(.../Download.c)	(revision 893caf9f58a08a2bd31068806e09603041d64add)
+++ firmware/App/Services/Download.c	(.../Download.c)	(revision 9e2779d825ea7e7b3445fa365f7bc2206fc0613a)
@@ -77,21 +77,16 @@
     SWUpdateCommandState = UPDATE_CMD_IDLE;
 }
 
-void clearCommBuffersForNextUpdate( void )
-{
-    clearCommBuffer( SW_UPDATE_COMMAD );
-    clearCommBuffer( thisStackMailBox );
-}
-
 // ********** private functions **********
 
 static void processIncomingCmdMessage( SW_UPDATE_CAN_MAIL_BOX_T mailBox )
 {
     SW_UPDATE_CMD_STATUS_T SWUpdateCmdStatus;
 
-    BOOL status = getCommBuffer( mailBox, (U08*)&SWUpdateCmdStatus, sizeof( SW_UPDATE_CMD_STATUS_T ) );
+    S32 numOfBytes = getNumberOfBytesInBuffer( mailBox );
+    BOOL status    = getCommBuffer( mailBox, (U08*)&SWUpdateCmdStatus, sizeof( SW_UPDATE_CMD_STATUS_T ) );
 
-    if ( ( TRUE == status ) && ( getNumberOfBytesInBuffer( mailBox ) >= CAN_MESSAGE_PAYLOAD_SIZE ) )
+    if ( ( TRUE == status ) && ( numOfBytes >= CAN_MESSAGE_PAYLOAD_SIZE ) )
     {
         SW_UPDATE_RESP_STATUS_T resp;
 
@@ -120,12 +115,8 @@
         }
 
         prepareResponseMessage( msgID, ackStatus, &resp );
-        status = sendAckNackStatusFromFirmware( mailBox, (U08*)&resp );
-
-        if ( TRUE == status )
-        {
-            clearCommBuffer( mailBox );
-        }
+        status = sendAckNackStatusFromFirmware( (U08*)&resp );
+        clearCommBuffer( mailBox );
     }
 }
 
@@ -177,12 +168,8 @@
             }
 
             prepareResponseMessage( SWUpdateRCVStatus.msgID, ackStatus, &resp );
-            status = sendAckNackStatusFromFirmware( mailBox, (U08*)&resp ); // TODO do we have to retry if send failed?
-
-            if ( TRUE == status )
-            {
-                clearCommBuffer( mailBox );
-            }
+            status = sendAckNackStatusFromFirmware( (U08*)&resp ); // TODO do we have to retry if send failed?
+            clearCommBuffer( mailBox );
         }
 
         clearSWUpdateBuffer();