streaming bug : clean-up unnecessary code changes