drop patched applied in upstream, refine remaining patches