Remove Treebeard potential conflicts and adjust to restructuring of Treebear.run