Removal of functions that were put into Menu class