Fix geocoder flights in 2D and remove unneeded code.