Remove patches

Change-Id: I1f802ce462a720dfdde3646dea7cdd54efc8a477