old tpl code cleaning