Removed dead code, removed thrown exception in menus