Move the cleaner into a tools dir
Example config tweaks