Cleanup old nav stuff- EE version

Open Annabel Gray requested to merge ee-cleanup_old_nav_stuff into master