more inventoried TE template support cleanup