Revert "Module cleaning"

This reverts commit 0a8edb9efcc898c6b2aec5e92a1e1415080beb9d.