wrapgen cleanup