Remove last vestiges of EE/stream duality