remove some topology terminlogy from fetcher and remove an unused import