Merge pull request #676 from danvk/module-cleanup