clean up topbar and rsvp helper