remove generics, player id in game state