1 files changed, 6 insertions, 27 deletions
diff --git a/app/models/namespaces/traversal/linear.rb b/app/models/namespaces/traversal/linear.rb
index 9006f104c64..1ca3c8e85f3 100644
--- a/app/models/namespaces/traversal/linear.rb
+++ b/app/models/namespaces/traversal/linear.rb
@@ -96,27 +96,6 @@ module Namespaces
         traversal_ids.present?
       end
 
-      def use_traversal_ids_for_self_and_hierarchy?
-        return false unless use_traversal_ids?
-        return false unless Feature.enabled?(:use_traversal_ids_for_self_and_hierarchy, root_ancestor)
-
-        traversal_ids.present?
-      end
-
-      def use_traversal_ids_for_ancestors?
-        return false unless use_traversal_ids?
-        return false unless Feature.enabled?(:use_traversal_ids_for_ancestors, root_ancestor)
-
-        traversal_ids.present?
-      end
-
-      def use_traversal_ids_for_ancestors_upto?
-        return false unless use_traversal_ids?
-        return false unless Feature.enabled?(:use_traversal_ids_for_ancestors_upto, root_ancestor)
-
-        traversal_ids.present?
-      end
-
       def root_ancestor
         strong_memoize(:root_ancestor) do
           if association(:parent).loaded? && parent.present?
@@ -150,13 +129,13 @@ module Namespaces
       end
 
       def self_and_hierarchy
-        return super unless use_traversal_ids_for_self_and_hierarchy?
+        return super unless use_traversal_ids?
 
         self_and_descendants.or(ancestors)
       end
 
       def ancestors(hierarchy_order: nil)
-        return super unless use_traversal_ids_for_ancestors?
+        return super unless use_traversal_ids?
 
         return self.class.none if parent_id.blank?
 
@@ -164,7 +143,7 @@ module Namespaces
       end
 
       def ancestor_ids(hierarchy_order: nil)
-        return super unless use_traversal_ids_for_ancestors?
+        return super unless use_traversal_ids?
 
         hierarchy_order == :desc ? traversal_ids[0..-2] : traversal_ids[0..-2].reverse
       end
@@ -176,7 +155,7 @@ module Namespaces
       # This copies the behavior of the recursive method. We will deprecate
       # this behavior soon.
       def ancestors_upto(top = nil, hierarchy_order: nil)
-        return super unless use_traversal_ids_for_ancestors_upto?
+        return super unless use_traversal_ids?
 
         # We can't use a default value in the method definition above because
         # we need to preserve those specific parameters for super.
@@ -198,7 +177,7 @@ module Namespaces
       end
 
       def self_and_ancestors(hierarchy_order: nil)
-        return super unless use_traversal_ids_for_ancestors?
+        return super unless use_traversal_ids?
 
         return self.class.where(id: id) if parent_id.blank?
 
@@ -206,7 +185,7 @@ module Namespaces
       end
 
       def self_and_ancestor_ids(hierarchy_order: nil)
-        return super unless use_traversal_ids_for_ancestors?
+        return super unless use_traversal_ids?
 
         hierarchy_order == :desc ? traversal_ids : traversal_ids.reverse
       end