more swarm player cruft removal