Cleaned up old code in Player, created override for player death