Code

patches: remove 4 patches merged upstream