fix my latest commit and remove old patches