Remove more pre-2.20 code