diff --git a/.gitignore b/.gitignore
index 4545270b3..8533abc2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
 
+*.orig
+
 # Ignore bundler config and downloaded libraries.
 /.bundle
 /vendor/bundle
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index 460280615..9fee9aa86 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -8,23 +8,6 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   def show
     @statuses = load_statuses
    
-    min_id = @statuses.empty? ? 0 : [@statuses[0].id, @statuses[-1].id].min
-   
-    tags_statuses = []
-    current_account.featured_tags.each do |tag|
-      @tag = tag
-      tags_statuses += (tags_statuses + load_tag_statuses).uniq(&:id)
-    end
-
-    if params_slice(:since_id, :min_id).empty?
-      tags_statuses = tags_statuses.select{|tag| tag.id > min_id}
-    end
-
-    @statuses = (@statuses + tags_statuses).uniq(&:id).sort_by(&:id)
-    if params_slice(:min_id).empty?
-      @statuses = @statuses.reverse!
-    end
-
     render json: @statuses,
            each_serializer: REST::StatusSerializer,
            relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
@@ -32,30 +15,6 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   end
 
   private
-
-  def load_tag_statuses
-    cached_tagged_statuses
-  end
-
-  def cached_tagged_statuses
-    cache_collection tagged_statuses, Status
-  end
-
-  def tagged_statuses
-    if @tag.nil?
-      []
-    else
-      statuses = tag_timeline_statuses.paginate_by_id(
-        limit_param(DEFAULT_STATUSES_LIMIT),
-        params_slice(:max_id, :since_id, :min_id)
-      )
-    end
-  end
-  
-  def tag_timeline_statuses
-    HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account, truthy_param?(:local))
-  end
-
  
   def load_statuses
     cached_home_statuses