Index: firmware/App/Services/Download.c
===================================================================
diff -u -ra5cbf07811efee3c038a550f251d3daefff2bf63 -r567a9736641b877ac0028db7481daad2dc65305f
--- firmware/App/Services/Download.c	(.../Download.c)	(revision a5cbf07811efee3c038a550f251d3daefff2bf63)
+++ firmware/App/Services/Download.c	(.../Download.c)	(revision 567a9736641b877ac0028db7481daad2dc65305f)
@@ -178,17 +178,10 @@
                     break;
             }
         }
-        else
-        {
-            prepareResponseMessage( SWUpdateRCVStatus.msgID, ackNackStatus, &resp );
-            status = sendAckNackStatusFromFirmware( (U08*)&resp ); // TODO do we have to retry if send failed?
-            clearCommBuffer( mailBox ); // TODo does this need to be here? How about resync?
-            //clearSWUpdateBuffer(); // TODO uncomment
-        }
 
         //prepareResponseMessage( SWUpdateRCVStatus.msgID, ackNackStatus, &resp );
         //status = sendAckNackStatusFromFirmware( (U08*)&resp ); // TODO do we have to retry if send failed?
-        //clearCommBuffer( mailBox ); // TODo does this need to be here? How about resync?
+        clearCommBuffer( mailBox ); // TODo does this need to be here? How about resync?
         //clearSWUpdateBuffer(); // TODO uncomment
     }
 }
@@ -238,14 +231,14 @@
     {
         if ( SWUpdateRCVStatus.cyberIndex != SW_UPDATE_FINAL_MSG_INDEX )
         {
-            U08 removeThis;
+            U16 removeThis;
             U08 index = 0;
             U32 counter;
             U08 test[8];
             sizeToWrite = SW_UPDATE_FLASH_BUFFER_SIZE;
             BOOL done = FALSE;
 
-            /*for ( removeThis = 0; removeThis < SW_UPDATE_FLASH_BUFFER_SIZE; removeThis++ )
+            for ( removeThis = 0; removeThis < SW_UPDATE_FLASH_BUFFER_SIZE; ++removeThis )
             {
                 test[ index ] = SWUpdateRCVStatus.SWUpdateBuffer[removeThis];
                 if ( index == 7 )
@@ -261,7 +254,7 @@
 
                 // TODO this is temporary until the ROTTING is removed from the APP
                 // SWUpdateRCVStatus.SWUpdateBuffer[ removeThis ] = 0xFF & ( SWUpdateRCVStatus.SWUpdateBuffer[removeThis] - 27 );
-            }*/
+            }
             // 3192290
             // 1596144
             if ( ( 1596144 - REMOVETHEVAR < SW_UPDATE_FLASH_BUFFER_SIZE ) && ( REMOVETHEVAR != 0 ) )
@@ -283,10 +276,6 @@
             }
         }
     }
-    //else
-    {
-        BOOL d = FALSE;
-    }
 
     return ackStatus;
 }