add TopologyFileFragment; cleanup