more tpl cleanup