Cleanup TreeDelegate internals