Fixing the bug related to the clean
Fixing bugs in the cleanner