Merge pull request #18903 from eileenmcnaughton/aip2
authorMatthew Wire <mjw@mjwconsult.co.uk>
Mon, 2 Nov 2020 10:58:10 +0000 (10:58 +0000)
committerGitHub <noreply@github.com>
Mon, 2 Nov 2020 10:58:10 +0000 (10:58 +0000)
Remove deprecated code


Trivial merge