Refactor/remove game events replay duplication