OSM scrapper code cleanup