Removed some patches that are no longer needed.