- some more menu cleanup