Changes back... multithreaded cleaning has to be re-thought