Some cleanup of RSVP pages