More tree cleanup