Remove now-unused manual gen which our own trait resolution can handle