Clean up in GameModel (not finished)