Kill pre-5.3 code