Clean up populate_address
Clean up osm:street