Clean up standard topologies to use build