Removing deprecated code.

Code which has been deprecated since 2.10.0 and which allowed
for straightforward removal.
Merge pull request #3152 from paulp/pr/deprecations

Removing deprecated code.