3.0 - Clean up view bake templates output