some more cleaning for importer.