Clean up interfaces so they compile & skeleton the swarm