tpl updates and module cleanup