clean up more of the import process.