Remove some unwanted changes

Leftovers after a long rebase.
5b981b1be7LemonBoy committed on 1/3/2021, 12:12:58 AM· committed by Andrew Kelleyparent608a73e
7 files changedLine totals unavailable