Tune tree heights -- cleanup from JSAV changes