nuke deprecated classes and methods
Merge pull request #340 from larsrh/topic/remove-deprecated

nuke deprecated classes and methods