Remove obsolete data fields / simplify GameState + Player