There are multiple several places in the code where we have deprecated code.
We should take advantage of a major release to perform a cleanup.
Most of affected classes have been deprecated for several major versions and should be safe to remove.