Add menu item removal, tests, refactoring