remove single stream retrieving feature
update unit and integration tests