Remove unused classes
Merge pull request #15 from berico-tpinney/issue_13

Remove unused classes