3.0 - Clean up view bake templates output

Pushed branch to wrong remote.  Sorry :smile: