A bit of cleanup [ci skip]