refactor out tree (without adding it back in ;) )