Controller cleanup and player-game addition