Cleanup of navigation