Fixed cleanup operation to look up the node id for deletion.