more NAT cleanup of net and topo