replace geocode with geocoder module; clean up addressfield_extras