Cleaning up some menu items