Fixing navigation
Removing unused entries from advanced preferences pane