Run cleanup if executed

This pr tries to tackle #1067. ArchiveImportTask.cleanup() never got executed. I'm not 100% sure if this is the right way to do this, but it seems to work well for me, so please test it out.