Organize the clean() calls and make sure propwareImporter is called in every branch