Remove obsolete code
Merge pull request #34 from myint/stream

Remove obsolete code