Removed unneeded functions & menus