final clean up for OsmImport performance improvements