More player entity cleanup