Removed patches for upstream
