clean up TemplateInstance per Arvs comments