Getting rid of EventSinkRunner