Clean up after swarminformed

Right now the structure doesn't terminate cleanly and may do some weird stuff.