Fixing Modules useless code