Merge "Remove SimpleDataTreeCandidate"