Clean up TreeNode API