3 files changed, 3 insertions, 10 deletions
diff --git a/lib/sidebars/groups/menus/ci_cd_menu.rb b/lib/sidebars/groups/menus/ci_cd_menu.rb
index c1d80458f49..0c2995f95e6 100644
--- a/lib/sidebars/groups/menus/ci_cd_menu.rb
+++ b/lib/sidebars/groups/menus/ci_cd_menu.rb
@@ -35,8 +35,7 @@ module Sidebars
         end
 
         def show_runners?
-          can?(context.current_user, :read_group_runners, context.group) &&
-            Feature.enabled?(:runner_list_group_view_vue_ui, context.group, default_enabled: :yaml)
+          can?(context.current_user, :read_group_runners, context.group)
         end
       end
     end
diff --git a/lib/sidebars/groups/menus/kubernetes_menu.rb b/lib/sidebars/groups/menus/kubernetes_menu.rb
index 98ca7865995..0d845978a93 100644
--- a/lib/sidebars/groups/menus/kubernetes_menu.rb
+++ b/lib/sidebars/groups/menus/kubernetes_menu.rb
@@ -23,7 +23,7 @@ module Sidebars
         def render?
           clusterable = context.group
 
-          Feature.enabled?(:certificate_based_clusters, clusterable, default_enabled: :yaml, type: :ops) &&
+          clusterable.certificate_based_clusters_enabled? &&
             can?(context.current_user, :read_cluster, clusterable)
         end
 
diff --git a/lib/sidebars/groups/menus/settings_menu.rb b/lib/sidebars/groups/menus/settings_menu.rb
index 09226256476..18ff3ebc714 100644
--- a/lib/sidebars/groups/menus/settings_menu.rb
+++ b/lib/sidebars/groups/menus/settings_menu.rb
@@ -89,16 +89,10 @@ module Sidebars
         end
 
         def ci_cd_menu_item
-          active_routes_path = if Feature.enabled?(:runner_list_group_view_vue_ui, context.group, default_enabled: :yaml)
-                                 'ci_cd#show'
-                               else
-                                 %w[ci_cd#show groups/runners#show groups/runners#edit]
-                               end
-
           ::Sidebars::MenuItem.new(
             title: _('CI/CD'),
             link: group_settings_ci_cd_path(context.group),
-            active_routes: { path: active_routes_path },
+            active_routes: { path: 'ci_cd#show' },
             item_id: :ci_cd
           )
         end