EventService cleaned up