Cleaned cruft from tpl