[CLEANUP] Replacing stream with rsvp