diff --git a/app/assets/templates/post-viewer/comment_tpl.jst.hbs b/app/assets/templates/post-viewer/comment_tpl.jst.hbs
deleted file mode 100644
index 41f91d427..000000000
--- a/app/assets/templates/post-viewer/comment_tpl.jst.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-{{#if canRemove}}
-<div class="controls">
-    <a href="#" class="delete comment_delete" title="{{t "delete"}}">
-      <div alt="Deletelabel" class="icons-deletelabel" />
-    <a/>
-</div>
-{{/if}}
-
-<div class="img">
-    {{#linkToPerson author}}
-        <div class="profile-image-container smaller" style="background-image : url('{{avatar.large}}')"></div>
-    {{/linkToPerson}}
-</div>
-
-<div class="bd">
-    <a href="/people/{{author.guid}}" class="author author-name">
-        {{author.name}}
-    </a>
-
-    <div class="collapsible comment-content">
-        {{{text}}}
-    </div>
-
-    <div class="info">
-        <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"/>
-    </div>
-</div>
diff --git a/app/assets/templates/post-viewer/content/activity-streams-photo_tpl.jst.hbs b/app/assets/templates/post-viewer/content/activity-streams-photo_tpl.jst.hbs
deleted file mode 100644
index 30e543995..000000000
--- a/app/assets/templates/post-viewer/content/activity-streams-photo_tpl.jst.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="photoset">
-  <div class="img-bounding-box">
-    <a href="{{object_url}}" class="stream-photo-link">
-      <img src="{{image_url}}" data-small-photo="{{image_url}}" data-full-photo="{{image_url}}" class="stream-photo" />
-    </a>
-  </div>
-</div>
diff --git a/app/assets/templates/post-viewer/content/note_tpl.jst.hbs b/app/assets/templates/post-viewer/content/note_tpl.jst.hbs
deleted file mode 100644
index bb45a09d9..000000000
--- a/app/assets/templates/post-viewer/content/note_tpl.jst.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="note-content">
-  {{{text}}}
-</div>
diff --git a/app/assets/templates/post-viewer/content/photo-backdrop_tpl.jst.hbs b/app/assets/templates/post-viewer/content/photo-backdrop_tpl.jst.hbs
deleted file mode 100644
index 6afb41df1..000000000
--- a/app/assets/templates/post-viewer/content/photo-backdrop_tpl.jst.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-{{#each photos}}
-  <div class="photo-fill" style="background-image: url({{sizes.large}})"> </div>
-  <img src="{{sizes.large}}" />
-{{/each}}
diff --git a/app/assets/templates/post-viewer/content/rich-media_tpl.jst.hbs b/app/assets/templates/post-viewer/content/rich-media_tpl.jst.hbs
deleted file mode 100644
index 02aaa7c8e..000000000
--- a/app/assets/templates/post-viewer/content/rich-media_tpl.jst.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="rich-media-container">
-  <div class="rich-media-container2">
-
-    {{{o_embed_cache.data.html}}}
-
-    <br>
-    <br>
-
-    {{{text}}}
-  </div>
-</div>
diff --git a/app/assets/templates/post-viewer/content/status_tpl.jst.hbs b/app/assets/templates/post-viewer/content/status_tpl.jst.hbs
deleted file mode 100644
index 05a443902..000000000
--- a/app/assets/templates/post-viewer/content/status_tpl.jst.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{{text}}}