Expanded the import remove listener to clean up more