Remove virtual-node for faster testing