diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 5bd5cec6..257e23e3 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,131 +1,3 @@
-<!--<template>
-  <div class="status-el base00-background" v-if="compact">
-    <div @click.prevent="linkClicked" class="status-content" v-html="status.statusnet_html"></div>
-    <div v-if="loggedIn">
-      <div class='status-actions'>
-        <div>
-          <a href="#" v-on:click.prevent="toggleReplying">
-            <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i>
-          </a>
-        </div>
-        <retweet-button :loggedIn="loggedIn" :status=status></retweet-button>
-        <favorite-button :loggedIn="loggedIn" :status=status></favorite-button>
-      </div>
-    </div>
-    <post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying" v-if="replying"/>
-  </div>
-  <div class="status-el base00-background base03-border status-fadein" v-else-if="!status.deleted" v-bind:class="[{ 'base01-background': isFocused }, { 'status-conversation': inConversation }]" >
-    <template v-if="muted">
-      <div class="media status container muted">
-        <small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small>
-        <small class="muteWords">{{muteWordHits.join(', ')}}</small>
-        <a href="#" class="unmute" @click.prevent="toggleMute"><i class="base09 icon-eye-off"></i></a>
-      </div>
-    </template>
-    <template v-if="!muted">
-      <div v-if="retweet" class="media container retweet-info">
-        <div class="media-left">
-          <i class='fa icon-retweet retweeted'></i>
-        </div>
-        <div class="media-body">
-          Repeated by <a :href="statusoid.user.statusnet_profile_url" style="font-weight: bold;" :title="'@'+statusoid.user.screen_name">{{retweeter}}</a>
-        </div>
-      </div>
-      <div class="media status container">
-        <div class="media-left">
-          <a :href="status.user.statusnet_profile_url">
-            <StillImage @click.native.prevent="toggleUserExpanded" :class="{retweeted: retweet}" class='avatar' :src="status.user.profile_image_url_original"/>
-            <StillImage v-if="retweet" class='avatar avatar-retweeter' :src="statusoid.user.profile_image_url_original"/>
-          </a>
-        </div>
-        <div class="media-body">
-          <div class="base03-border usercard" v-if="userExpanded">
-            <user-card-content :user="status.user" :switcher="false"></user-card-content>
-          </div>
-          <div class="user-content">
-            <div class="media-heading">
-              <div class="name-and-links">
-                <h4 class="user-name">{{status.user.name}}</h4>
-                <div class="links">
-                  <h4>
-                  <small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small>
-                  <small v-if="status.in_reply_to_screen_name"> &gt;
-                    <router-link :to="{ name: 'user-profile', params: { id: status.in_reply_to_user_id } }">
-                      {{status.in_reply_to_screen_name}}
-                    </router-link>
-                  </small>
-                  <template v-if="isReply">
-                    <small>
-                      <a href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)"><i class="icon-reply" @mouseenter="replyEnter(status.in_reply_to_status_id, $event)" @mouseout="replyLeave()"></i></a>
-                    </small>
-                  </template>
-                  -
-                  <small>
-                    <router-link :to="{ name: 'conversation', params: { id: status.id } }">
-                      <timeago :since="status.created_at" :auto-update="60"></timeago>
-                    </router-link>
-                  </small>
-                  </h4>
-                </div>
-                <h4 class="replies" v-if="inConversation">
-                  <small v-if="replies.length">Replies:</small>
-                  <small v-for="reply in replies">
-                    <a href="#" @click.prevent="gotoOriginal(reply.id)" @mouseenter="replyEnter(reply.id, $event)" @mouseout="replyLeave()">{{reply.name}}&nbsp;</a>
-                  </small>
-                </h4>
-              </div>
-              <div class="heading-icons">
-                <a href="#" @click.prevent="toggleMute" v-if="unmuted"><i class="base09 icon-eye-off"></i></a>
-                <a :href="status.external_url" target="_blank" v-if="!status.is_local" class="source_url"><i class="base09 icon-binoculars"></i></a>
-                <template v-if="expandable">
-                  <a href="#" @click.prevent="toggleExpanded" class="expand"><i class="base09 icon-plus-squared"></i></a>
-                </template>
-              </div>
-            </div>
-
-            <div class="status-preview base00-background base03-border" v-if="showPreview && preview">
-              <StillImage class="avatar" :src="preview.user.profile_image_url_original"/>
-              <div class="text">
-                <h4>
-                  {{ preview.user.name }}
-                  <small><a>{{ preview.user.screen_name}}</a></small>
-                </h4>
-                <div @click.prevent="linkClicked" class="status-content" v-html="preview.statusnet_html"></div>
-              </div>
-            </div>
-            <div class="status-preview status-preview-loading base00-background base03-border" v-else-if="showPreview">
-              <i class="base09 icon-spin4 animate-spin"></i>
-            </div>
-
-            <div @click.prevent="linkClicked" class="status-content" v-html="status.statusnet_html"></div>
-
-            <div v-if='status.attachments' class='attachments'>
-              <attachment v-if="!hideAttachments" :status-id="status.id" :nsfw="status.nsfw" :attachment="attachment" v-for="attachment in status.attachments" :key="attachment.id">
-              </attachment>
-            </div>
-          </div>
-
-          <div class='status-actions'>
-            <div v-if="loggedIn">
-              <a href="#" v-on:click.prevent="toggleReplying">
-                <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i>
-              </a>
-            </div>
-            <retweet-button :loggedIn="loggedIn" :status=status></retweet-button>
-            <favorite-button :loggedIn="loggedIn" :status=status></favorite-button>
-            <delete-button :status=status></delete-button>
-          </div>
-        </div>
-      </div>
-      <div class="status base00-background container" v-if="replying">
-        <div class="reply-left"/>
-        <post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying"/>
-      </div>
-    </template>
-  </div>
-</template>
--->
-
 <template>
   <div class="status-el base00-background base03-border" :class="[{ 'base01-background': isFocused }, { 'status-conversation': inlineExpanded }]">
     <template v-if="muted && !noReplyLinks">