Update for removed classes deprecated in 2.x.
Merge pull request #713 from ADmad/removed-classes

Removed classes