Merge "Clean up menus"