diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index c2827e209..caf926936 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -11,8 +11,6 @@ Index =
 
     return unless Conf['JSON Index']
 
-    @enabled = true
-
     Callbacks.Post.push
       name: 'Index Page Numbers'
       cb:   @node
diff --git a/src/Linkification/Embedding.coffee b/src/Linkification/Embedding.coffee
index 188779901..7c6544bf8 100644
--- a/src/Linkification/Embedding.coffee
+++ b/src/Linkification/Embedding.coffee
@@ -55,7 +55,6 @@ Embedding =
     embed.dataset[name] = value for name, value of {key, uid, options, href}
 
     $.on embed, 'click', Embedding.cb.click
-    $.on d, 'IndexRefreshInternal', Embedding.cb.catalogRemove.bind(embed) if Index.enabled
     $.after link, [$.tn(' '), embed]
 
     if Conf['Auto-embed'] and !Conf['Floating Embeds'] and !post.isFetchedQuote
@@ -147,12 +146,6 @@ Embedding =
 
       return container
 
-    catalogRemove: ->
-      isCatalog = $.hasClass(doc, 'catalog-mode')
-      if (isCatalog and $.hasClass(@, 'embedded')) or (!isCatalog and $.hasClass(@, 'embed-removed'))
-        Embedding.cb.toggle.call @
-        $.toggleClass @, 'embed-removed'
-
     title: (req, data) ->
       {key, uid, options, link, post} = data
       {status} = req