tpl cleanup