Removing unused imported class (as of #209)
Removing references to non-existing classes (see #192)
Merge pull request #215 from Ocramius/cleanup/unused-imports

Cleanup: unused imports