Minor cleanup
Fix printing of template 'file' variables
Remove placeholder functions. Minor clean up