Get rid of EventBusProvider