tpl driver yf internal cleanup
code cleanup