Removed unused classes
Why do these variables even exist? They're never used.
Merge pull request #37 from choltfo/Cleanup

Merge branch Cleanup