Removed dead conditions in the navigation services.