Stream cleaning 2