Cleanup the menus a bit...