Revert "New version of Minimal Stream"

This reverts commit 820814357dfcad0145a2f55c7dddd7e33448ae7d.