Remove assumptions about topology: step 1