Update sources and remove upstreamed patches