Fix cleaner iteration

Please review, I think this was/is broken...