Tree Analysis clean up