remove stale classes (leftover from refactoring)
Merge pull request #5 from heiko-braun/cleanup_refactoring

Cleanup leftover from refactoring