Start with cleaning up the menu.