cleanup obsolete code
refactor menu items into its own service