removed dependency to EventBus