Refactor the BindClean module