remove Stream.When