Removing @deprecated 3.1 functionality and classes.

Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
Merge pull request #3396 from halkyon/deprecation_cleanup

Removing @deprecated 3.1 functionality and classes.
Remove all redundant whitespace