Cleaning up eventBus usage