Remove topology assumptions: Part II
Change TODO