Removed unused modules
Merge pull request #6 from andrewblond/feature/unused-modules

Removed unused modules