cleanups in topology