Move tombstone to NodeService