[task] removed some unused classes
Merge pull request #2 from davidmoebius/cleanup_classes

[task] removed some unused classes