remove redundant checks from topology code