Got rid of geocoder dependency.