two geocoders - more cleanup