Removed/commented out patches that don't apply