Controller Cleanup 3

Also, cut attendees search out of volunteers