Removing deprecated class/functions marked for deprecation in 3.0/3.1
Merge pull request #3425 from halkyon/removing_deprecated2

Removing deprecated class/functions marked for deprecation in 3.0/3.1