Drop unnecessary sourceIndex for streams