Fixup
Fix for clean_until_done
Merge pull request #600 from NielsZeilemaker/clean_until_done

Clean until done