Cleaned up ingestor topology.