removed old mentions of eventBus, still need to refactor fields/table