We now start the rewrite of the cleaning module.