diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
index 2abac2b099c9..68e2cee35f5b 100644
--- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
+++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl
@@ -356,8 +356,7 @@ lookup_smaller_sample(Table, Id) ->
         [] ->
             not_found;
         [{_, Slide}] ->
-            Slide1 = exometer_slide:optimize(Slide),
-            maybe_convert_for_compatibility(Table, Slide1)
+            exometer_slide:optimize(Slide)
     end.
 
 -spec lookup_samples(atom(), any(), #range{}) -> maybe_slide().
@@ -366,8 +365,7 @@ lookup_samples(Table, Id, Range) ->
         [] ->
             not_found;
         [{_, Slide}] ->
-            Slide1 = exometer_slide:optimize(Slide),
-            maybe_convert_for_compatibility(Table, Slide1)
+            exometer_slide:optimize(Slide)
     end.
 
 lookup_all(Table, Ids, SecondKey) ->
@@ -383,39 +381,9 @@ lookup_all(Table, Ids, SecondKey) ->
         [] ->
             not_found;
         _ ->
-            Slide = exometer_slide:sum(Slides, empty(Table, 0)),
-            maybe_convert_for_compatibility(Table, Slide)
+            exometer_slide:sum(Slides, empty(Table, 0))
     end.
 
-maybe_convert_for_compatibility(Table, Slide)
-  when Table =:= channel_stats_fine_stats orelse
-       Table =:= channel_exchange_stats_fine_stats orelse
-       Table =:= vhost_stats_fine_stats ->
-     ConversionNeeded = rabbit_feature_flags:is_disabled(
-                          drop_unroutable_metric),
-     case ConversionNeeded of
-         false ->
-             Slide;
-         true ->
-             %% drop_drop because the metric is named "drop_unroutable"
-             rabbit_mgmt_data_compat:drop_drop_unroutable_metric(Slide)
-     end;
-maybe_convert_for_compatibility(Table, Slide)
-  when Table =:= channel_queue_stats_deliver_stats orelse
-       Table =:= channel_stats_deliver_stats orelse
-       Table =:= queue_stats_deliver_stats orelse
-       Table =:= vhost_stats_deliver_stats ->
-    ConversionNeeded = rabbit_feature_flags:is_disabled(
-                         empty_basic_get_metric),
-    case ConversionNeeded of
-        false ->
-            Slide;
-        true ->
-            rabbit_mgmt_data_compat:drop_get_empty_queue_metric(Slide)
-    end;
-maybe_convert_for_compatibility(_, Slide) ->
-    Slide.
-
 get_table_keys(Table, Id0) ->
     ets:select(Table, match_spec_keys(Id0)).
 
diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data_compat.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data_compat.erl
index 3d5cfdf36e08..1de6cdb1d044 100644
--- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data_compat.erl
+++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data_compat.erl
@@ -8,10 +8,8 @@
 -module(rabbit_mgmt_data_compat).
 
 -export([fill_get_empty_queue_metric/1,
-         drop_get_empty_queue_metric/1,
          fill_consumer_active_fields/1,
-         fill_drop_unroutable_metric/1,
-         drop_drop_unroutable_metric/1]).
+         fill_drop_unroutable_metric/1]).
 
 fill_get_empty_queue_metric(Slide) ->
     exometer_slide:map(
@@ -26,21 +24,6 @@ fill_get_empty_queue_metric(Slide) ->
               Value
       end, Slide).
 
-drop_get_empty_queue_metric(Slide) ->
-    exometer_slide:map(
-      fun
-          (Value) when is_tuple(Value) andalso size(Value) =:= 8 ->
-              %% We want to remove the last element, which is
-              %% the count of basic.get on empty queues.
-              list_to_tuple(
-                lists:sublist(
-                  tuple_to_list(Value), size(Value) - 1));
-          (Value) when is_tuple(Value) andalso size(Value) =:= 7 ->
-              Value;
-          (Value) ->
-              Value
-      end, Slide).
-
 fill_drop_unroutable_metric(Slide) ->
     exometer_slide:map(
       fun
@@ -54,20 +37,6 @@ fill_drop_unroutable_metric(Slide) ->
               Value
       end, Slide).
 
-drop_drop_unroutable_metric(Slide) ->
-    exometer_slide:map(
-      fun
-          (Value) when is_tuple(Value) andalso size(Value) =:= 4 ->
-              %% Remove the last element.
-              list_to_tuple(
-                lists:sublist(
-                  tuple_to_list(Value), size(Value) - 1));
-          (Value) when is_tuple(Value) andalso size(Value) =:= 3 ->
-              Value;
-          (Value) ->
-              Value
-      end, Slide).
-
 fill_consumer_active_fields(ConsumersStatsList) ->
     [case proplists:get_value(active, ConsumerStats) of
          undefined ->
diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_ff.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_ff.erl
index 4bc47db143b5..9be869bcbdd3 100644
--- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_ff.erl
+++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_ff.erl
@@ -10,13 +10,11 @@
 -rabbit_feature_flag(
    {empty_basic_get_metric,
     #{desc          => "Count AMQP `basic.get` on empty queues in stats",
-      %%TODO remove compatibility code
       stability     => required
      }}).
 
 -rabbit_feature_flag(
   {drop_unroutable_metric,
    #{desc          => "Count unroutable publishes to be dropped in stats",
-     %%TODO remove compatibility code
      stability     => required
     }}).
diff --git a/deps/rabbitmq_mqtt/src/rabbit_mqtt_ff.erl b/deps/rabbitmq_mqtt/src/rabbit_mqtt_ff.erl
index 2432cc2ac5d0..c7ca1cc9a6c2 100644
--- a/deps/rabbitmq_mqtt/src/rabbit_mqtt_ff.erl
+++ b/deps/rabbitmq_mqtt/src/rabbit_mqtt_ff.erl
@@ -26,4 +26,4 @@
 
 -spec track_client_id_in_ra() -> boolean().
 track_client_id_in_ra() ->
-    not rabbit_feature_flags:is_enabled(delete_ra_cluster_mqtt_node).
+    rabbit_feature_flags:is_disabled(delete_ra_cluster_mqtt_node).