Clean-up deprecated menu options