simplify streams. closes #3