clean up around cluster topologies