diff --git a/deps/rabbit/include/mc.hrl b/deps/rabbit/include/mc.hrl
index 997f6e8ddd6c..8e82a550f4be 100644
--- a/deps/rabbit/include/mc.hrl
+++ b/deps/rabbit/include/mc.hrl
@@ -6,7 +6,7 @@
                 exchange :: rabbit_misc:resource_name(),
                 routing_keys = [] :: [rabbit_types:routing_key()],
                 count = 0 :: non_neg_integer(),
-                anns  = #{} :: death_anns()
+                anns :: death_anns()
                }).
 
 -record(deaths, {first :: death_key(),
diff --git a/deps/rabbit/src/rabbit_fifo_dlx.erl b/deps/rabbit/src/rabbit_fifo_dlx.erl
index 31a193be0822..4ac50c2d60d8 100644
--- a/deps/rabbit/src/rabbit_fifo_dlx.erl
+++ b/deps/rabbit/src/rabbit_fifo_dlx.erl
@@ -154,7 +154,6 @@ discard(Msgs, Reason, undefined, State) ->
     {State, [{mod_call, rabbit_global_counters, messages_dead_lettered,
               [Reason, rabbit_quorum_queue, disabled, length(Msgs)]}]};
 discard(Msgs0, Reason, {at_most_once, {Mod, Fun, Args}}, State) ->
-    rabbit_log:debug("DISCARD ~p", [Msgs0]),
     Idxs = [I || ?MSG(I, _) <- Msgs0],
     Effect = {log, Idxs,
               fun (Log) ->
diff --git a/deps/rabbit/src/rabbit_fifo_dlx_worker.erl b/deps/rabbit/src/rabbit_fifo_dlx_worker.erl
index 6f277a53cfab..65813b68c5bb 100644
--- a/deps/rabbit/src/rabbit_fifo_dlx_worker.erl
+++ b/deps/rabbit/src/rabbit_fifo_dlx_worker.erl
@@ -433,8 +433,6 @@ ack(#state{settled_ids = Ids,
     state().
 redeliver_messages(#state{pendings = Pendings,
                           settle_timeout = SettleTimeout} = State0) ->
-
-    rabbit_log:debug("ReDeliver messages ~p ", [Pendings]),
     case lookup_dlx(State0) of
         {not_found, State} ->
             %% Configured dead-letter-exchange does (still) not exist.
diff --git a/deps/rabbit/test/mc_SUITE.erl b/deps/rabbit/test/mc_SUITE.erl
index 8efe9007ec4e..51e17fb70883 100644
--- a/deps/rabbit/test/mc_SUITE.erl
+++ b/deps/rabbit/test/mc_SUITE.erl
@@ -26,7 +26,6 @@ all_tests() ->
      amqpl_death_records,
      amqpl_amqp_bin_amqpl,
      amqp_amqpl,
-     stuff,
      amqp_to_amqpl_data_body
     ].
 
@@ -35,40 +34,10 @@ groups() ->
      {tests, [], all_tests()}
     ].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_Group, Config) ->
-    Config.
-
-end_per_group(_Group, _Config) ->
-    ok.
-
-init_per_testcase(_TestCase, Config) ->
-    Config.
-
-end_per_testcase(_TestCase, _Config) ->
-    ok.
-
 %%%===================================================================
 %%% Test cases
 %%%===================================================================
 
-stuff(_Config) ->
-    MA = #'v1_0.message_annotations'{content = [{{symbol, <<"k">>}, {utf8, <<"v">>}}]},
-    % Desc = {described,
-    %         {utf8, <<"URL">>},
-    %         {utf8, <<"https://rabbitmq.com">>}},
-    MAEnc = amqp10_framing:encode(MA),
-    ct:pal("~p", [MAEnc]),
-    ct:pal("~p", [amqp10_framing:decode(MAEnc)]),
-
-    % amqp10_framing:decode(Desc),
-    ok.
-
 amqpl_defaults(_Config) ->
     Props = #'P_basic'{},
     Payload = [<<"data">>],