TPL file cleanup and pull request rollup