remove patches that are no longer needed

Change-Id: I7d52524d4715efed5ae1c21cdb2e814afe289529