Remove some vestiges of the old streaming