streams: clean up