NXP-13231: cleanup and format
NXP-13231: Delete temporary files ASAP