Rip out broken stream_raw
Fix stream_raw removal