Got rid of a class that should have not been gotten rid of...
Merge pull request #24 from Jedwondle/master

Got rid of a class that should have not been gotten rid of...