Clean up dependencies
Convert to use trident topology