diff --git a/templates/themes/app/content/components/ng_component_quote/quote_style_1.html.twig b/templates/themes/app/content/components/ng_component_quote/quote_style_1.html.twig
index 563f01b4a..3f8661350 100644
--- a/templates/themes/app/content/components/ng_component_quote/quote_style_1.html.twig
+++ b/templates/themes/app/content/components/ng_component_quote/quote_style_1.html.twig
@@ -3,9 +3,6 @@
 
 {% import "@ibexadesign/content/parts/macros.html.twig" as macros %}
 
-{# {% set image = content.fieldValue('image') %}
-{% set image_mobile = content.fieldValue('image_mobile') %} #}
-
 {% block content %}
     <article class="view-component view-component-quote quote-style-1">
         {% if not content.fields.title.empty %}
diff --git a/templates/themes/app/content/views/full/ng_article.html.twig b/templates/themes/app/content/views/full/ng_article.html.twig
index aff181f52..8fa1ce99e 100644
--- a/templates/themes/app/content/views/full/ng_article.html.twig
+++ b/templates/themes/app/content/views/full/ng_article.html.twig
@@ -69,7 +69,6 @@
 {% endblock %}
 
 {% block structuredData %}
-    {# structured data #}
     <script type="application/ld+json">
         {
             "@context": "http://schema.org",
diff --git a/templates/themes/app/content/views/full/ng_blog_post.html.twig b/templates/themes/app/content/views/full/ng_blog_post.html.twig
index cb50b4115..9d7ad0f39 100644
--- a/templates/themes/app/content/views/full/ng_blog_post.html.twig
+++ b/templates/themes/app/content/views/full/ng_blog_post.html.twig
@@ -76,7 +76,6 @@
 {% endblock %}
 
 {% block structuredData %}
-    {# structured data #}
     <script type="application/ld+json">
         {
             "@context": "http://schema.org",
diff --git a/templates/themes/app/content/views/full/ng_news.html.twig b/templates/themes/app/content/views/full/ng_news.html.twig
index 3725e3817..24c0e6bbe 100644
--- a/templates/themes/app/content/views/full/ng_news.html.twig
+++ b/templates/themes/app/content/views/full/ng_news.html.twig
@@ -76,7 +76,6 @@
 {% endblock %}
 
 {% block structuredData %}
-    {# structured data #}
     <script type="application/ld+json">
         {
             "@context": "http://schema.org",
diff --git a/templates/themes/app/content/views/full/ng_recipe.html.twig b/templates/themes/app/content/views/full/ng_recipe.html.twig
index 75f885e1a..329e44b16 100644
--- a/templates/themes/app/content/views/full/ng_recipe.html.twig
+++ b/templates/themes/app/content/views/full/ng_recipe.html.twig
@@ -95,7 +95,6 @@
 {% endblock %}
 
 {% block structuredData %}
-    {# structured data #}
     <script type="application/ld+json">
         {
             "@context": "http://schema.org",
diff --git a/templates/themes/app/content/views/zigzag/ng_banner.html.twig b/templates/themes/app/content/views/zigzag/ng_banner.html.twig
index a562d1c70..503050c06 100644
--- a/templates/themes/app/content/views/zigzag/ng_banner.html.twig
+++ b/templates/themes/app/content/views/zigzag/ng_banner.html.twig
@@ -23,9 +23,6 @@
         <div class="short">
             {{ ng_render_field(content.fields.description) }}
         </div>
-        {# {% if not content.fields.link_label.empty %}
-            <a class="btn btn-default" href="#">{{ content.fields.link_label.value.text }}</a>
-        {% endif %} #}
     </div>
 
 </article>
diff --git a/templates/themes/app/emails/info_collection/email.html.twig b/templates/themes/app/emails/info_collection/email.html.twig
index edaac73b7..cf2229c49 100644
--- a/templates/themes/app/emails/info_collection/email.html.twig
+++ b/templates/themes/app/emails/info_collection/email.html.twig
@@ -3,8 +3,6 @@
     {{ site_name }} – {{ ibexa_content_name(content) }} [{{ collected_fields.sender_email.value }}]
 {% endapply %}{% endblock %}
 
-{#% block sender %}{{ collected_fields.sender_email.value }}{% endblock %#}
-
 {% block recipient %}{{ ibexa_field_value(content, 'recipient') }}{% endblock %}
 
 {% block email %}
diff --git a/templates/themes/app/forms/info_collection_base.html.twig b/templates/themes/app/forms/info_collection_base.html.twig
index ceb293623..428fea8a2 100644
--- a/templates/themes/app/forms/info_collection_base.html.twig
+++ b/templates/themes/app/forms/info_collection_base.html.twig
@@ -22,11 +22,6 @@
             {% else %}
                 <p>{{ 'ngsite.collected_info.success_text'|trans }}</p>
             {% endif %}
-
-            {#        <p>{{ 'ngsite.collected_info.information_collected'|trans }}:</p>#}
-            {#        {% for collected_field, collected_field_value in collected_fields %}#}
-            {#            <p><strong>{{ content.fields[collected_field].name }}:</strong> {{ collected_field_value }}</p>#}
-            {#        {% endfor %}#}
         </div>
     {% endblock %}
 {% endif %}
diff --git a/templates/themes/app/forms/theme.html.twig b/templates/themes/app/forms/theme.html.twig
index b6eaef14b..95ffb9f87 100644
--- a/templates/themes/app/forms/theme.html.twig
+++ b/templates/themes/app/forms/theme.html.twig
@@ -118,7 +118,6 @@
 {%- endblock form_widget_simple -%}
 
 {%- block hidden_row -%}
-        {#{{- form_label(form) -}}#}
         {{ block('hidden_widget') }}
         {{- form_errors(form) -}}
 {%- endblock hidden_row -%}
@@ -163,13 +162,11 @@
 {% endblock %} #}
 
 {%- block form_widget_compound -%}
-    {# <div {{ block('widget_container_attributes') }}>#}
-        {%- if form is rootform -%}
-            {{ form_errors(form) }}
-        {%- endif -%}
-        {{- block('form_rows') -}}
-        {{- form_rest(form) -}}
-    {#</div>#}
+    {%- if form is rootform -%}
+        {{ form_errors(form) }}
+    {%- endif -%}
+    {{- block('form_rows') -}}
+    {{- form_rest(form) -}}
 {%- endblock form_widget_compound -%}
 
 {%- block checkbox_widget -%}
diff --git a/templates/themes/app/modules/knp_menu/menu.html.twig b/templates/themes/app/modules/knp_menu/menu.html.twig
index 2eda9c1b0..03d71df76 100644
--- a/templates/themes/app/modules/knp_menu/menu.html.twig
+++ b/templates/themes/app/modules/knp_menu/menu.html.twig
@@ -6,11 +6,13 @@
     {% if item.displayed %}
         {# building the class of the item #}
         {%- set classes = item.attribute('class') is not empty ? [item.attribute('class')] : [] %}
+
         {# NGSTACK-448 comment out default matcher so it doesn't add current/active class on any items #}
         {#{%- if matcher.isCurrent(item) %}#}
             {#{%- set classes = classes|merge([options.currentClass]) %}#}
         {#{%- elseif matcher.isAncestor(item, options.matchingDepth) %}#}
         {# END NGSTACK-448 #}
+
         {%- if matcher.isAncestor(item, options.matchingDepth) %}
             {%- set classes = classes|merge([options.ancestorClass]) %}
         {%- endif %}
@@ -34,11 +36,13 @@
         {%- if classes is not empty %}
             {%- set attributes = attributes|merge({'class': classes|join(' ')}) %}
         {%- endif %}
+
         {# NGSTACK-448 add data-location-id parameter to all menu items with Ibexa location #}
         {%- if item.extras.ibexa_location is defined and item.extras.ibexa_location is not empty %}
             {%- set attributes = attributes|merge({'data-location-id': item.extras.ibexa_location.id}) %}
         {%- endif %}
         {# END NGSTACK-448 #}
+
         {# displaying the item #}
         {% import _self as knp_menu %}
         <li{{ knp_menu.attributes(attributes) }}>
@@ -47,10 +51,12 @@
             {%- else %}
                 {{ block('spanElement') }}
             {%- endif %}
-            {# render the list of children#}
+
+            {# render the list of children #}
             {%- set childrenClasses = item.childrenAttribute('class') is not empty ? [item.childrenAttribute('class')] : [] %}
             {%- set childrenClasses = childrenClasses|merge(['menu_level_' ~ item.level]) %}
             {%- set listAttributes = item.childrenAttributes|merge({'class': childrenClasses|join(' ') }) %}
+
             {{ block('list') }}
         </li>
     {% endif %}