diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 739c3d4c8..d29c19ebe 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -1,104 +1,102 @@
-<% cache [locale_and_user_status(comment), comment, @commentable, comment.author, (@comment_flags[comment.id] if @comment_flags)] do %>
-  <div class="row">
-  	<div id="<%= dom_id(comment) %>" class="comment small-12 column">
+<div class="row">
+	<div id="<%= dom_id(comment) %>" class="comment small-12 column">
 
-      <% if comment.hidden? || comment.user.hidden? %>
-        <% if select_children(@comments, comment).size > 0 %>
-          <div class="is-deleted">
-            <p><%= t("debates.comment.deleted") %></p>
-          </div>
-        <% end %>
-      <% else %>
-        <% if comment.as_administrator? %>
-          <%= image_tag("admin_avatar.png", size: 32, class: "admin-avatar left") %>
-        <% elsif comment.as_moderator? %>
-          <%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar left") %>
-        <% else %>
-          <% if comment.user.organization? %>
-            <%= image_tag("collective_avatar.png", size: 32, class: "avatar left") %>
-          <% else %>
-            <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "left") %>
-          <% end %>
-          <% if comment.user.hidden? %>
-            <i class="icon-deleted user-deleted"></i>
-          <% end %>
-        <% end %>
-
-        <div class="comment-body">
-          <div class="comment-info">
-
-            <% if comment.as_administrator? %>
-              <span class="user-name"><%= t("debates.comment.admin") %> #<%= comment.administrator_id%></span>
-            <% elsif comment.as_moderator? %>
-              <span class="user-name"><%= t("debates.comment.moderator") %> #<%= comment.moderator_id%></span>
-            <% else %>
-
-              <% if comment.user.hidden? %>
-                <span class="user-name"><%= t("debates.comment.user_deleted") %></span>
-              <% else %>
-                <span class="user-name"><%= comment.user.name %></span>
-                <% if comment.user.official? %>
-                  &nbsp;&bullet;&nbsp;
-                  <span class="label round level-<%= comment.user.official_level %>">
-                    <%= comment.user.official_position %>
-                  </span>
-                <% end %>
-              <% end %>
-              <% if comment.user.verified_organization? %>
-                &nbsp;&bullet;&nbsp;
-                <span class="label round is-association">
-                  <%= t("shared.collective") %>
-                </span>
-              <% end %>
-              <% if comment.user_id == @commentable.author_id %>
-                &nbsp;&bullet;&nbsp;
-                <span class="label round is-author">
-                  <%= t("debates.comment.author") %>
-                </span>
-              <% end %>
-
-            <% end %>
-
-            &nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
-          </div>
-
-          <% if comment.as_administrator? %>
-            <p class="comment-user is-admin"><%= comment.body %></p>
-          <% elsif comment.as_moderator? %>
-            <p class="comment-user is-moderator"><%= comment.body %></p>
-          <% elsif comment.user.official? && comment.user_id == @commentable.author_id %>
-            <p class="comment-user level-<%= comment.user.official_level %> is-author"><%= comment.body %></p>
-          <% elsif comment.user.official? %>
-            <p class="comment-user level-<%= comment.user.official_level %>"><%= comment.body %></p>
-          <% elsif comment.user_id == @commentable.author_id %>
-            <p class="comment-user is-author"><%= comment.body %></p>
-          <% else %>
-            <p class="comment-user"><%= comment.body %></p>
-          <% end %>
-          <span id="<%= dom_id(comment) %>_votes" class="comment-votes right">
-            <%= render 'comments/votes', comment: comment %>
-          </span>
-
-          <div class="reply">
-            <%= t("debates.comment.responses", count: select_children(@comments, comment).size) %>
-
-            <% if user_signed_in? %>
-              <span class="divider">&nbsp;|&nbsp;</span>
-              <%= link_to(comment_link_text(comment), "",
-                          class: "js-add-comment-link", data: {'id': dom_id(comment)}) %>
-
-              <%= render 'comments/actions', comment: comment %>
-
-              <%= render 'comments/form', {commentable: @commentable, parent_id: comment.id, toggeable: true} %>
-            <% end %>
-          </div>
+    <% if comment.hidden? || comment.user.hidden? %>
+      <% if select_children(@comments, comment).size > 0 %>
+        <div class="is-deleted">
+          <p><%= t("debates.comment.deleted") %></p>
         </div>
       <% end %>
-<% end %>
-    <div class="comment-children">
-      <% select_children(@comments, comment).each do |child| %>
-        <%= render 'comments/comment', comment: child %>
+    <% else %>
+      <% if comment.as_administrator? %>
+        <%= image_tag("admin_avatar.png", size: 32, class: "admin-avatar left") %>
+      <% elsif comment.as_moderator? %>
+        <%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar left") %>
+      <% else %>
+        <% if comment.user.organization? %>
+          <%= image_tag("collective_avatar.png", size: 32, class: "avatar left") %>
+        <% else %>
+          <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "left") %>
+        <% end %>
+        <% if comment.user.hidden? %>
+          <i class="icon-deleted user-deleted"></i>
+        <% end %>
       <% end %>
-    </div>
+
+      <div class="comment-body">
+        <div class="comment-info">
+
+          <% if comment.as_administrator? %>
+            <span class="user-name"><%= t("debates.comment.admin") %> #<%= comment.administrator_id%></span>
+          <% elsif comment.as_moderator? %>
+            <span class="user-name"><%= t("debates.comment.moderator") %> #<%= comment.moderator_id%></span>
+          <% else %>
+
+            <% if comment.user.hidden? %>
+              <span class="user-name"><%= t("debates.comment.user_deleted") %></span>
+            <% else %>
+              <span class="user-name"><%= comment.user.name %></span>
+              <% if comment.user.official? %>
+                &nbsp;&bullet;&nbsp;
+                <span class="label round level-<%= comment.user.official_level %>">
+                  <%= comment.user.official_position %>
+                </span>
+              <% end %>
+            <% end %>
+            <% if comment.user.verified_organization? %>
+              &nbsp;&bullet;&nbsp;
+              <span class="label round is-association">
+                <%= t("shared.collective") %>
+              </span>
+            <% end %>
+            <% if comment.user_id == @commentable.author_id %>
+              &nbsp;&bullet;&nbsp;
+              <span class="label round is-author">
+                <%= t("debates.comment.author") %>
+              </span>
+            <% end %>
+
+          <% end %>
+
+          &nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
+        </div>
+
+        <% if comment.as_administrator? %>
+          <p class="comment-user is-admin"><%= comment.body %></p>
+        <% elsif comment.as_moderator? %>
+          <p class="comment-user is-moderator"><%= comment.body %></p>
+        <% elsif comment.user.official? && comment.user_id == @commentable.author_id %>
+          <p class="comment-user level-<%= comment.user.official_level %> is-author"><%= comment.body %></p>
+        <% elsif comment.user.official? %>
+          <p class="comment-user level-<%= comment.user.official_level %>"><%= comment.body %></p>
+        <% elsif comment.user_id == @commentable.author_id %>
+          <p class="comment-user is-author"><%= comment.body %></p>
+        <% else %>
+          <p class="comment-user"><%= comment.body %></p>
+        <% end %>
+        <span id="<%= dom_id(comment) %>_votes" class="comment-votes right">
+          <%= render 'comments/votes', comment: comment %>
+        </span>
+
+        <div class="reply">
+          <%= t("debates.comment.responses", count: select_children(@comments, comment).size) %>
+
+          <% if user_signed_in? %>
+            <span class="divider">&nbsp;|&nbsp;</span>
+            <%= link_to(comment_link_text(comment), "",
+                        class: "js-add-comment-link", data: {'id': dom_id(comment)}) %>
+
+            <%= render 'comments/actions', comment: comment %>
+
+            <%= render 'comments/form', {commentable: @commentable, parent_id: comment.id, toggeable: true} %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  <div class="comment-children">
+    <% select_children(@comments, comment).each do |child| %>
+      <%= render 'comments/comment', comment: child %>
+    <% end %>
   </div>
+</div>
 </div>
\ No newline at end of file
diff --git a/app/views/debates/_comments.html.erb b/app/views/debates/_comments.html.erb
index fe7fc3cb3..5fbea960d 100644
--- a/app/views/debates/_comments.html.erb
+++ b/app/views/debates/_comments.html.erb
@@ -1,30 +1,28 @@
-<% cache [locale_and_user_status, @all_visible_comments, @all_visible_comments.map(&:author), @debate.comments_count, @comment_flags] do %>
-  <section class="row-full comments">
-    <div class="row">
-      <div id="comments" class="small-12 column">
+<section class="row-full comments">
+  <div class="row">
+    <div id="comments" class="small-12 column">
 
-        <h2>
-          <%= t("debates.show.comments_title") %>
-          <span>(<%= @debate.comments_count %>)</span>
-        </h2>
+      <h2>
+        <%= t("debates.show.comments_title") %>
+        <span>(<%= @debate.comments_count %>)</span>
+      </h2>
 
-        <% if user_signed_in? %>
-          <%= render 'comments/form', {commentable: @debate, parent_id: nil, toggeable: false} %>
-        <% else %>
-        <br>
+      <% if user_signed_in? %>
+        <%= render 'comments/form', {commentable: @debate, parent_id: nil, toggeable: false} %>
+      <% else %>
+      <br>
 
-        <div class="alert-box radius info">
-          <%= t("debates.show.login_to_comment",
-              signin: link_to(t("votes.signin"), new_user_session_path),
-              signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-          </div>
-        <% end %>
+      <div class="alert-box radius info">
+        <%= t("debates.show.login_to_comment",
+            signin: link_to(t("votes.signin"), new_user_session_path),
+            signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+        </div>
+      <% end %>
 
-        <% @root_comments.each do |comment| %>
-          <%= render 'comments/comment', comment: comment  %>
-        <% end %>
-        <%= paginate @root_comments %>
-      </div>
+      <% @root_comments.each do |comment| %>
+        <%= render 'comments/comment', comment: comment  %>
+      <% end %>
+      <%= paginate @root_comments %>
     </div>
-  </section>
-<% end %>
\ No newline at end of file
+  </div>
+</section>
\ No newline at end of file