More cleaning in modules.