Removed deprecated classes
Merge pull request #137 from mhotan/master

Removed deprecated classes.