Clean up forms & support manual attendee addition