Remove unused classes
Modifications
Merge pull request #2 from lordjone/master

sync with lordjone's master