Remove unused classed
Merge pull request #17 from fkmhrk/remove-unused-classes

Remove unused classed