remove rest of local patches which have been merged with upstream