Importers cleanup