re-adding tree to optimize agents cleanup