Some cleanup with Game object