Fixed topology remove

fixes #388
fixes #268 btw