[CLEANUP] Replacing stream with RSVP