Cleaning up of navigation