Removed local version of module.
Merge branch 'cleanup/local-modules'