remove some patches for now

Change-Id: I40426eff10442a43d22e43de9a211a60a25a3269