Get rid of some lingering multi-tree stuff