This file's changes could have been submitted as a separate PR the day it was made; definitely something to be said for PRing independent cleanup or isolated features when they're ready rather than with a big PR.