More cleanup. Removing unnecessary patches.