Merge pull request #21661 from eileenmcnaughton/cleanup