Remove simplified options from TreeBuilder