Merge pull request #19037 from eileenmcnaughton/dep
authorEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 24 Nov 2020 07:25:50 +0000 (20:25 +1300)
committerGitHub <noreply@github.com>
Tue, 24 Nov 2020 07:25:50 +0000 (20:25 +1300)
Remove some deprecated code


Trivial merge