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.