Misc tree cleanup