Remove streaming, breaks in unicorn