code cleanup, continued refactor for modularity

continue to use eventBusService, gameStateService