Remove unnecessary templates
Allow markup in templates (safe)