RSVP cleanup