Removed defunct links on navbar
Merging