SetTreeValues cleanup