Cleanup
Does not compile - refactoring menu