Removing unused EventBus