More cleanup in Player.