Refactoring with the uninit of clones anf of the module itself