Cleanups in TreeItem