Post release 5.9.5
Update 5.9.5-SNAPSHOT to 5.9.6-SNAPSHOT
NXP-13231: cleanup and format

Remove dead code since NXP-8546
NXP-13231: cleanup and format
NXP-13231: Delete temporary files ASAP