remove EventBusManager from handlers