Remove refs to streaming code until completed.