more cleanups for event_source_server