17 Commits (remove_swarm)