Address some comments from pull 173

This PR addresses some comments from PR #173 

Basically removes unused classes and unnecessary code