PMPI: Import Cleanup