Merge "Remove unused class StreamHelper"