Should we also remove it from the nodeMap?