Finish conversion to new Layout format.
Remove reference to DataNode.