Cleanup menu, fixes #2237