Simplify clean up script
Bump
Drop upstreamed ninja patch