Boot Menu - cleanup/optimisations