Clean out merged upstream patch