Cleaning up and preppping for adding swarm.