diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl
deleted file mode 100644
index 27ec3dffc..000000000
--- a/view/tpl/diaspora_comment.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- {{$guid}}
- {{$parent_guid}}
- {{$authorsig}}
- {{$body}}
- {{$handle}}
-
-
-
\ No newline at end of file
diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl
deleted file mode 100644
index 37a9e88b3..000000000
--- a/view/tpl/diaspora_comment_relay.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- {{$guid}}
- {{$parent_guid}}
- {{$parentsig}}
- {{$authorsig}}
- {{$body}}
- {{$handle}}
-
-
-
\ No newline at end of file
diff --git a/view/tpl/diaspora_consensus.tpl b/view/tpl/diaspora_consensus.tpl
deleted file mode 100644
index b6b7cf13d..000000000
--- a/view/tpl/diaspora_consensus.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-{{$guid_q}}
-{{$question}}
-
- {{$guid_y}}
- {{$agree}}
-
-
- {{$guid_n}}
- {{$disagree}}
-
-
- {{$guid_a}}
- {{$abstain}}
-
-
-
diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl
deleted file mode 100644
index dc4482e4b..000000000
--- a/view/tpl/diaspora_conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- {{$conv.guid}}
- {{$conv.subject}}
- {{$conv.created_at}}
-
- {{foreach $conv.messages as $msg}}
-
-
- {{$msg.guid}}
- {{$msg.parent_guid}}
- {{if $msg.parent_author_signature}}
- {{$msg.parent_author_signature}}
- {{/if}}
- {{$msg.author_signature}}
- {{$msg.text}}
- {{$msg.created_at}}
- {{$msg.diaspora_handle}}
- {{$msg.conversation_guid}}
-
-
- {{/foreach}}
-
- {{$conv.diaspora_handle}}
- {{$conv.participant_handles}}
-
-
-
diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl
deleted file mode 100644
index a27e92240..000000000
--- a/view/tpl/diaspora_like.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- {{$positive}}
- {{$guid}}
- {{$target_type}}
- {{$parent_guid}}
- {{$authorsig}}
- {{$handle}}
-
-
-
diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl
deleted file mode 100644
index 8209540c5..000000000
--- a/view/tpl/diaspora_like_relay.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- {{$positive}}
- {{$guid}}
- {{$target_type}}
- {{$parent_guid}}
- {{$parentsig}}
- {{$authorsig}}
- {{$handle}}
-
-
-
diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl
deleted file mode 100644
index 3413d79b0..000000000
--- a/view/tpl/diaspora_message.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- {{$msg.guid}}
- {{$msg.parent_guid}}
- {{$msg.author_signature}}
- {{$msg.text}}
- {{$msg.created_at}}
- {{$msg.diaspora_handle}}
- {{$msg.conversation_guid}}
-
-
-
diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl
deleted file mode 100644
index 256459d8d..000000000
--- a/view/tpl/diaspora_photo.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- {{$guid}}
- {{$handle}}
- {{$public}}
- {{$created_at}}
- {{$path}}
- {{$filename}}
- {{$msg_guid}}
-
-
-
diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl
deleted file mode 100644
index ebfe9e5b7..000000000
--- a/view/tpl/diaspora_post.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- {{$body}}
- {{$guid}}
- {{$handle}}
- {{$poll}}
- {{$public}}
- {{$created}}
- {{$provider}}
-
-
-
diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl
deleted file mode 100644
index 5e7aed41f..000000000
--- a/view/tpl/diaspora_relay_retraction.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- {{$type}}
- {{$guid}}
- {{$signature}}
- {{$handle}}
-
-
-
diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl
deleted file mode 100644
index 4e3ff3243..000000000
--- a/view/tpl/diaspora_relayable_retraction.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- {{$parentsig}}
- {{$guid}}
- {{$target_type}}
- {{$handle}}
- {{$authorsig}}
-
-
-
diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl
deleted file mode 100644
index 963bb9e12..000000000
--- a/view/tpl/diaspora_reshare.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- {{$root_handle}}
- {{$root_guid}}
- {{$guid}}
- {{$handle}}
- {{$public}}
- {{$created}}
- {{$provider}}
-
-
-
diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl
deleted file mode 100644
index 9df066d38..000000000
--- a/view/tpl/diaspora_retract.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- {{$guid}}
- {{$handle}}
- {{$type}}
-
-
-
diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl
deleted file mode 100644
index 59eb06124..000000000
--- a/view/tpl/diaspora_share.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- {{$sender}}
- {{$recipient}}
-
-
-
\ No newline at end of file
diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl
deleted file mode 100644
index f0f346da8..000000000
--- a/view/tpl/diaspora_signed_retract.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- {{$guid}}
- {{$type}}
- {{$handle}}
- {{$signature}}
-
-
-