tpl cleanup

tpl cleanup