remove some more cruft [ci skip]