tpl: cleanup