Upstream merge, delete pulled patches