removed unused imports, some topologies reviewed