Added Player, cleanup