Remove last Action->NodeData dependency