remove patches merged by upstream