diff --git a/src/General/lib/fetcher.class b/src/General/lib/fetcher.class
index 5a498720a..891ae1959 100644
--- a/src/General/lib/fetcher.class
+++ b/src/General/lib/fetcher.class
@@ -170,7 +170,8 @@ class Fetcher
       new Board @boardID
     thread = g.threads["#{@boardID}.#{@threadID}"] or
       new Thread @threadID, board
-    post = new Post Build.post(o), thread, board, {isArchived: true}
+    post = new Post Build.post(o), thread, board
+    post.kill()
     post.file.thumbURL = o.file.turl if post.file
     post.isFetchedQuote = true
     Main.callbackNodes Post, [post]
diff --git a/src/General/lib/post.class b/src/General/lib/post.class
index a32eeeda4..f2b87b31a 100755
--- a/src/General/lib/post.class
+++ b/src/General/lib/post.class
@@ -2,7 +2,7 @@ class Post
   @callbacks = new Callbacks 'Post'
   toString: -> @ID
 
-  constructor: (root, @thread, @board, that={}) ->
+  constructor: (root, @thread, @board) ->
     <% if (tests_enabled) { %>
     root2 = root.cloneNode true
     for el in $$ '.mobile', root2
@@ -29,7 +29,6 @@ class Post
     @ID     = +root.id[2..]
     @fullID = "#{@board}.#{@ID}"
 
-    @cleanup root if that.isOriginalMarkup
     post = $ '.post',     root
     info = $ '.postInfo', post
     @nodes =
@@ -82,7 +81,7 @@ class Post
 
     @parseComment()
     @parseQuotes()
-    @parseFile that
+    @parseFile()
 
     @isDead   = false
     @isHidden = false
@@ -93,7 +92,6 @@ class Post
       @clones = g.posts[@fullID].clones
       clone.origin = @ for clone in @clones
     g.posts.push @fullID, thread.posts.push @, board.posts.push @, @
-    @kill() if that.isArchived
 
   parseComment: ->
     # Merge text nodes and remove empty ones.
@@ -161,7 +159,7 @@ class Post
     fullID = "#{match[1]}.#{match[2]}"
     @quotes.push fullID unless fullID in @quotes
 
-  parseFile: (that) ->
+  parseFile: ->
     return unless (fileEl = $ '.file', @nodes.post) and thumb = $ 'img[data-md5]', fileEl
     # Supports JPG/PNG/GIF/PDF.
     # Flash files are not supported.
@@ -186,13 +184,6 @@ class Post
       @file.dimensions = nameNode.nextSibling.textContent.match(/\d+x\d+/)[0]
     @file.name = fileText.title or nameNode.title or nameNode.textContent
 
-  cleanup: (root) ->
-    for node in $$ '.mobile', root
-      $.rm node
-    for node in $$ '.desktop', root
-      $.rmClass node, 'desktop'
-    return
-
   kill: (file) ->
     if file
       return if @file.isDead