Some menu cleanup
More cleanup