2.3 smarty cleanup

Spring cleanup... :smile: 

The idea behind this PR is to remove "unnecessary" Smarty templates as well as leverage the `renderTo` usages