more menu cleanup