remove more cruft [ci skip]