optimisations
removing old icons
cleanup