diff --git a/big_tests/tests/sm_SUITE.erl b/big_tests/tests/sm_SUITE.erl
index 8d1a1cafc8..7d8da59b91 100644
--- a/big_tests/tests/sm_SUITE.erl
+++ b/big_tests/tests/sm_SUITE.erl
@@ -1186,7 +1186,7 @@ rpc_stop_hook_handler(HookExtra, HostType) ->
                             HookExtra, 50).
 
 hook_handler_fn(Acc,
-                #{args := [Jid]} = _Params,
+                #{jid := Jid} = _Params,
                 #{luser := LUser, pid := TestCasePid} = _Extra) ->
     {U, _S, R} = jid:to_lower(Jid),
     case U of
diff --git a/src/ejabberd_hooks.erl b/src/ejabberd_hooks.erl
deleted file mode 100644
index 2eb2ea5d35..0000000000
--- a/src/ejabberd_hooks.erl
+++ /dev/null
@@ -1,115 +0,0 @@
-%%%----------------------------------------------------------------------
-%%% File    : ejabberd_hooks.erl
-%%% Author  : Alexey Shchepin <alexey@process-one.net>
-%%% Purpose : Manage hooks
-%%% Created :  8 Aug 2004 by Alexey Shchepin <alexey@process-one.net>
-%%%
-%%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
-%%%
-%%% This program is free software; you can redistribute it and/or
-%%% modify it under the terms of the GNU General Public License as
-%%% published by the Free Software Foundation; either version 2 of the
-%%% License, or (at your option) any later version.
-%%%
-%%% This program is distributed in the hope that it will be useful,
-%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%%% General Public License for more details.
-%%%
-%%% You should have received a copy of the GNU General Public License
-%%% along with this program; if not, write to the Free Software
-%%% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-%%%
-%%%----------------------------------------------------------------------
-
--module(ejabberd_hooks).
--author('alexey@process-one.net').
-
-%% External exports
--export([add/5,
-         delete/5,
-         add_args/2]).
-
--export([add/1,
-         delete/1]).
-
--export([gen_hook_fn_wrapper/3]).
-
--ignore_xref([add/4, delete/4, error_running_hook/3, start_link/0,
-    % temporary until the module is deleted
-    add/1, delete/1, add/5, delete/5]).
-
--include("mongoose.hrl").
-
--type hook() :: {HookName :: atom(),
-                 HostType :: mongooseim:host_type() | global,
-                 Module :: module(),
-                 Fn :: atom(),
-                 Priority:: integer()}.
-
--export_type([hook/0]).
-%%%----------------------------------------------------------------------
-%%% API
-%%%----------------------------------------------------------------------
-
-%% @doc Add a module and function to the given hook.
-%% The integer Priority is used to sort the calls:
-%% low numbers are executed before high numbers.
--spec add(HookName :: atom(),
-          HostType :: mongooseim:host_type() | global,
-          Module :: module(),
-          Function :: atom(),
-          Priority :: integer()) -> ok.
-add(HookName, HostType, Module, Function, Priority) ->
-    add_hook({HookName, HostType, Module, Function, Priority}).
-
--spec add([hook()]) -> ok.
-add(Hooks) when is_list(Hooks) ->
-    [add_hook(Hook) || Hook <- Hooks],
-    ok.
-
-%% @doc Delete a module and function from this hook.
-%% It is important to indicate exactly the same information as when the call was added.
--spec delete(HookName :: atom(),
-             HostType :: mongooseim:host_type() | global,
-             Module :: module(),
-             Function :: atom(),
-             Priority :: integer()) -> ok.
-delete(HookName, HostType, Module, Function, Priority) ->
-    delete_hook({HookName, HostType, Module, Function, Priority}).
-
--spec delete([hook()]) -> ok.
-delete(Hooks) when is_list(Hooks) ->
-    [delete_hook(Hook) || Hook <- Hooks],
-    ok.
-
--spec add_args(HookParams :: map(), LegacyArgsList :: [term()]) ->
-    HookParamsWithArgs :: map().
-add_args(HookParams, LegacyArgsList) ->
-    HookParams#{args => LegacyArgsList}.
-
-%%%----------------------------------------------------------------------
-%%% Internal functions
-%%%----------------------------------------------------------------------
-
--spec add_hook(hook()) -> ok.
-add_hook({HookName, HostType, Module, Function, Priority}) when is_atom(Function) ->
-    gen_hook:add_handler(HookName, HostType,
-                         fun ?MODULE:gen_hook_fn_wrapper/3,
-                         #{module => Module, function => Function},
-                         Priority).
-
--spec delete_hook(hook()) -> ok.
-delete_hook({HookName, HostType, Module, Function, Priority}) when is_atom(Function) ->
-    gen_hook:delete_handler(HookName, HostType,
-                            fun ?MODULE:gen_hook_fn_wrapper/3,
-                            #{module => Module, function => Function},
-                            Priority).
-
-gen_hook_fn_wrapper(Acc, #{args := Args}, #{module := Module, function := Function}) ->
-    case apply(Module, Function, [Acc | Args]) of
-        stop -> {stop, stopped};
-        {stop, NewAcc} -> {stop, NewAcc};
-        NewAcc -> {ok, NewAcc}
-    end.
diff --git a/src/global_distrib/mod_global_distrib_bounce.erl b/src/global_distrib/mod_global_distrib_bounce.erl
index 7a65a4c89a..35c668c69f 100644
--- a/src/global_distrib/mod_global_distrib_bounce.erl
+++ b/src/global_distrib/mod_global_distrib_bounce.erl
@@ -53,7 +53,7 @@ start(HostType, _Opts) ->
 -spec stop(mongooseim:host_type()) -> any().
 stop(HostType) ->
     ejabberd_sup:stop_child(?MODULE),
-    gen_hook:add_handlers(hooks(HostType)),
+    gen_hook:delete_handlers(hooks(HostType)),
     ets:delete(?MS_BY_TARGET),
     ets:delete(?MESSAGE_STORE).
 
diff --git a/src/mongoose_hooks.erl b/src/mongoose_hooks.erl
index f165b411da..57e693ff7f 100644
--- a/src/mongoose_hooks.erl
+++ b/src/mongoose_hooks.erl
@@ -180,10 +180,7 @@
     Result :: term(). % ok | empty_state | HandlerState
 c2s_remote_hook(HostType, Tag, Args, HandlerState, C2SState) ->
     Params = #{tag => Tag, hook_args => Args, c2s_state => C2SState},
-    LegacyArgs = [Tag, Args, C2SState],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, LegacyArgs),
-    run_hook_for_host_type(c2s_remote_hook, HostType, HandlerState,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(c2s_remote_hook, HostType, HandlerState, Params).
 
 -spec adhoc_local_commands(HostType, From, To, AdhocRequest) -> Result when
     HostType :: mongooseim:host_type(),
@@ -193,9 +190,7 @@ c2s_remote_hook(HostType, Tag, Args, HandlerState, C2SState) ->
     Result :: mod_adhoc:command_hook_acc().
 adhoc_local_commands(HostType, From, To, AdhocRequest) ->
     Params = #{from => From, to => To, adhoc_request => AdhocRequest},
-    LegacyArgs = [From, To, AdhocRequest],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, LegacyArgs),
-    run_hook_for_host_type(adhoc_local_commands, HostType, empty, ParamsWithLegacyArgs).
+    run_hook_for_host_type(adhoc_local_commands, HostType, empty, Params).
 
 -spec adhoc_sm_commands(HostType, From, To, AdhocRequest) -> Result when
     HostType :: mongooseim:host_type(),
@@ -215,10 +210,8 @@ adhoc_sm_commands(HostType, From, To, AdhocRequest) ->
 anonymous_purge_hook(LServer, Acc, LUser) ->
     Jid = jid:make_bare(LUser, LServer),
     Params = #{jid => Jid},
-    Args = [LUser, LServer],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(anonymous_purge_hook, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(anonymous_purge_hook, HostType, Acc, Params).
 
 -spec auth_failed(HostType, Server, Username) -> Result when
     HostType :: mongooseim:host_type(),
@@ -227,9 +220,7 @@ anonymous_purge_hook(LServer, Acc, LUser) ->
     Result :: ok.
 auth_failed(HostType, Server, Username) ->
     Params = #{username => Username, server => Server},
-    Args = [Username, Server],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(auth_failed, HostType, ok, ParamsWithLegacyArgs).
+    run_hook_for_host_type(auth_failed, HostType, ok, Params).
 
 -spec does_user_exist(HostType, Jid, RequestType) -> Result when
       HostType :: mongooseim:host_type(),
@@ -238,9 +229,7 @@ auth_failed(HostType, Server, Username) ->
       Result :: boolean().
 does_user_exist(HostType, Jid, RequestType) ->
     Params = #{jid => Jid, request_type => RequestType},
-    Args = [HostType, Jid, RequestType],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(does_user_exist, HostType, false, ParamsWithLegacyArgs).
+    run_hook_for_host_type(does_user_exist, HostType, false, Params).
 
 -spec remove_domain(HostType, Domain) -> Result when
     HostType :: mongooseim:host_type(),
@@ -248,24 +237,19 @@ does_user_exist(HostType, Jid, RequestType) ->
     Result :: mongoose_domain_api:remove_domain_acc().
 remove_domain(HostType, Domain) ->
     Params = #{domain => Domain},
-    Args = [HostType, Domain],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(remove_domain, HostType, #{failed => []}, ParamsWithLegacyArgs).
+    run_hook_for_host_type(remove_domain, HostType, #{failed => []}, Params).
 
 -spec node_cleanup(Node :: node()) -> Acc :: map().
 node_cleanup(Node) ->
     Params = #{node => Node},
-    Args = [Node],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_global_hook(node_cleanup, #{}, ParamsWithLegacyArgs).
+    run_global_hook(node_cleanup, #{}, Params).
 
 -spec failed_to_store_message(Acc) -> Result when
     Acc :: mongoose_acc:t(),
     Result :: mongoose_acc:t().
 failed_to_store_message(Acc) ->
     HostType = mongoose_acc:host_type(Acc),
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(failed_to_store_message, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(failed_to_store_message, HostType, Acc, #{}).
 
 %%% @doc The `filter_local_packet' hook is called to filter out
 %%% stanzas routed with `mongoose_local_delivery'.
@@ -274,8 +258,7 @@ failed_to_store_message(Acc) ->
     Result :: drop | filter_packet_acc().
 filter_local_packet(FilterAcc = {_From, _To, Acc, _Packet}) ->
     HostType = mongoose_acc:host_type(Acc),
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(filter_local_packet, HostType, FilterAcc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(filter_local_packet, HostType, FilterAcc, #{}).
 
 %%% @doc The `filter_packet' hook is called to filter out
 %%% stanzas routed with `mongoose_router_global'.
@@ -283,7 +266,7 @@ filter_local_packet(FilterAcc = {_From, _To, Acc, _Packet}) ->
     Acc :: filter_packet_acc(),
     Result ::  drop | filter_packet_acc().
 filter_packet(Acc) ->
-    run_global_hook(filter_packet, Acc, []).
+    run_global_hook(filter_packet, Acc, #{}).
 
 %%% @doc The `inbox_unread_count' hook is called to get the number
 %%% of unread messages in the inbox for a user.
@@ -294,16 +277,14 @@ filter_packet(Acc) ->
     Result :: mongoose_acc:t().
 inbox_unread_count(LServer, Acc, User) ->
     Params = #{user => User},
-    Args = [User],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(inbox_unread_count, LServer, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(inbox_unread_count, LServer, Acc, Params).
 
 -spec extend_inbox_message(mongoose_acc:t(), mod_inbox:inbox_res(), jlib:iq()) ->
     [exml:element()].
 extend_inbox_message(MongooseAcc, InboxRes, IQ) ->
     HostType = mongoose_acc:host_type(MongooseAcc),
     HookParams = #{mongoose_acc => MongooseAcc, inbox_res => InboxRes, iq => IQ},
-    run_fold(extend_inbox_message, HostType, [], HookParams).
+    run_hook_for_host_type(extend_inbox_message, HostType, [], HookParams).
 
 %%% @doc The `get_key' hook is called to extract a key from `mod_keystore'.
 -spec get_key(HostType, KeyName) -> Result when
@@ -312,9 +293,7 @@ extend_inbox_message(MongooseAcc, InboxRes, IQ) ->
     Result :: mod_keystore:key_list().
 get_key(HostType, KeyName) ->
     Params = #{key_id => {KeyName, HostType}},
-    Args = [{KeyName, HostType}],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(get_key, HostType, [], ParamsWithLegacyArgs).
+    run_hook_for_host_type(get_key, HostType, [], Params).
 
 -spec packet_to_component(Acc, From, To) -> Result when
     Acc :: mongoose_acc:t(),
@@ -323,9 +302,7 @@ get_key(HostType, KeyName) ->
     Result :: mongoose_acc:t().
 packet_to_component(Acc, From, To) ->
     Params = #{from => From, to => To},
-    Args = [From, To],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_global_hook(packet_to_component, Acc, ParamsWithLegacyArgs).
+    run_global_hook(packet_to_component, Acc, Params).
 
 -spec presence_probe_hook(HostType, Acc, From, To, Pid) -> Result when
     HostType :: mongooseim:host_type(),
@@ -336,9 +313,7 @@ packet_to_component(Acc, From, To) ->
     Result :: mongoose_acc:t().
 presence_probe_hook(HostType, Acc, From, To, Pid) ->
     Params = #{from => From, to => To, pid => Pid},
-    Args = [From, To, Pid],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(presence_probe_hook, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(presence_probe_hook, HostType, Acc, Params).
 
 %%% @doc The `push_notifications' hook is called to push notifications.
 -spec push_notifications(HostType, Acc, NotificationForms, Options) -> Result when
@@ -349,9 +324,7 @@ presence_probe_hook(HostType, Acc, From, To, Pid) ->
     Result :: ok | {error, any()}.
 push_notifications(HostType, Acc, NotificationForms, Options) ->
     Params = #{options => Options, notification_forms => NotificationForms},
-    Args = [HostType, NotificationForms, Options],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(push_notifications, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(push_notifications, HostType, Acc, Params).
 
 %%% @doc The `register_subhost' hook is called when a component
 %%% is registered for ejabberd_router or a subdomain is added to mongoose_subdomain_core.
@@ -361,9 +334,7 @@ push_notifications(HostType, Acc, NotificationForms, Options) ->
     Result :: any().
 register_subhost(LDomain, IsHidden) ->
     Params = #{ldomain => LDomain, is_hidden => IsHidden},
-    Args = [LDomain, IsHidden],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_global_hook(register_subhost, ok, ParamsWithLegacyArgs).
+    run_global_hook(register_subhost, ok, Params).
 
 %%% @doc The `register_user' hook is called when a user is successfully
 %%% registered in an authentication backend.
@@ -375,9 +346,7 @@ register_subhost(LDomain, IsHidden) ->
 register_user(HostType, LServer, LUser) ->
     Jid = jid:make_bare(LUser, LServer),
     Params = #{jid => Jid},
-    Args = [LUser, LServer],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(register_user, HostType, ok, ParamsWithLegacyArgs).
+    run_hook_for_host_type(register_user, HostType, ok, Params).
 
 %%% @doc The `remove_user' hook is called when a user is removed.
 -spec remove_user(Acc, LServer, LUser) -> Result when
@@ -388,10 +357,8 @@ register_user(HostType, LServer, LUser) ->
 remove_user(Acc, LServer, LUser) ->
     Jid = jid:make_bare(LUser, LServer),
     Params = #{jid => Jid},
-    Args = [LUser, LServer],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(remove_user, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(remove_user, HostType, Acc, Params).
 
 -spec resend_offline_messages_hook(Acc, JID) -> Result when
     Acc :: mongoose_acc:t(),
@@ -399,10 +366,8 @@ remove_user(Acc, LServer, LUser) ->
     Result :: mongoose_acc:t().
 resend_offline_messages_hook(Acc, JID) ->
     Params = #{jid => JID},
-    Args = [JID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(resend_offline_messages_hook, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(resend_offline_messages_hook, HostType, Acc, Params).
 
 %%% @doc The `session_cleanup' hook is called when sm backend cleans up a user's session.
 -spec session_cleanup(Server, Acc, User, Resource, SID) -> Result when
@@ -415,10 +380,8 @@ resend_offline_messages_hook(Acc, JID) ->
 session_cleanup(Server, Acc, User, Resource, SID) ->
     JID = jid:make(User, Server, Resource),
     Params = #{jid => JID, sid => SID},
-    Args = [User, Server, Resource, SID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(session_cleanup, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(session_cleanup, HostType, Acc, Params).
 
 %%% @doc The `set_vcard' hook is called when the caller wants to set the VCard.
 -spec set_vcard(HostType, UserJID, VCard) -> Result when
@@ -428,9 +391,7 @@ session_cleanup(Server, Acc, User, Resource, SID) ->
     Result :: ok | {error, any()}.
 set_vcard(HostType, UserJID, VCard) ->
     Params = #{user => UserJID, vcard => VCard},
-    Args = [HostType, UserJID, VCard],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(set_vcard, HostType, {error, no_handler_defined}, ParamsWithLegacyArgs).
+    run_hook_for_host_type(set_vcard, HostType, {error, no_handler_defined}, Params).
 
 -spec unacknowledged_message(Acc, JID) -> Result when
     Acc :: mongoose_acc:t(),
@@ -439,9 +400,7 @@ set_vcard(HostType, UserJID, VCard) ->
 unacknowledged_message(Acc, JID) ->
     HostType = mongoose_acc:host_type(Acc),
     Params = #{jid => JID},
-    Args = [JID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(unacknowledged_message, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(unacknowledged_message, HostType, Acc, Params).
 
 -spec filter_unacknowledged_messages(HostType, Jid, Buffer) -> Result when
     HostType :: mongooseim:host_type(),
@@ -449,7 +408,7 @@ unacknowledged_message(Acc, JID) ->
     Buffer :: [mongoose_acc:t()],
     Result :: [mongoose_acc:t()].
 filter_unacknowledged_messages(HostType, Jid, Buffer) ->
-    run_fold(filter_unacknowledged_messages, HostType, Buffer, #{jid => Jid}).
+    run_hook_for_host_type(filter_unacknowledged_messages, HostType, Buffer, #{jid => Jid}).
 
 %%% @doc The `unregister_subhost' hook is called when a component
 %%% is unregistered from ejabberd_router or a subdomain is removed from mongoose_subdomain_core.
@@ -458,9 +417,7 @@ filter_unacknowledged_messages(HostType, Jid, Buffer) ->
     Result :: any().
 unregister_subhost(LDomain) ->
     Params = #{ldomain => LDomain},
-    Args = [LDomain],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_global_hook(unregister_subhost, ok, ParamsWithLegacyArgs).
+    run_global_hook(unregister_subhost, ok, Params).
 
 -spec user_available_hook(Acc, JID) -> Result when
     Acc :: mongoose_acc:t(),
@@ -468,10 +425,8 @@ unregister_subhost(LDomain) ->
     Result :: mongoose_acc:t().
 user_available_hook(Acc, JID) ->
     Params = #{jid => JID},
-    Args = [JID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(user_available_hook, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(user_available_hook, HostType, Acc, Params).
 
 %%% @doc The `user_ping_response' hook is called when a user responds to a ping.
 -spec user_ping_response(HostType, Acc, JID, Response, TDelta) -> Result when
@@ -483,9 +438,7 @@ user_available_hook(Acc, JID) ->
     Result :: mongoose_acc:t().
 user_ping_response(HostType, Acc, JID, Response, TDelta) ->
     Params = #{jid => JID, response => Response, time_delta => TDelta},
-    Args =  [HostType, JID, Response, TDelta],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(user_ping_response, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(user_ping_response, HostType, Acc, Params).
 
 %%% @doc The `user_ping_timeout' hook is called when there is a timeout
 %%% when waiting for a ping response from a user.
@@ -504,11 +457,9 @@ user_ping_timeout(HostType, JID) ->
     To :: jid:jid(),
     El :: exml:element(),
     Result :: mongoose_acc:t().
-user_receive_packet(HostType, Acc, JID, From, To, El) ->
+user_receive_packet(HostType, Acc, JID, _From, _To, _El) ->
     Params = #{jid => JID},
-    Args = [JID, From, To, El],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(user_receive_packet, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(user_receive_packet, HostType, Acc, Params).
 
 -spec user_sent_keep_alive(HostType, JID) -> Result when
     HostType :: mongooseim:host_type(),
@@ -516,9 +467,7 @@ user_receive_packet(HostType, Acc, JID, From, To, El) ->
     Result :: any().
 user_sent_keep_alive(HostType, JID) ->
     Params = #{jid => JID},
-    Args = [JID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(user_sent_keep_alive, HostType, ok, ParamsWithLegacyArgs).
+    run_hook_for_host_type(user_sent_keep_alive, HostType, ok, Params).
 
 %%% @doc A hook called when a user sends an XMPP stanza.
 %%% The hook's handler is expected to accept four parameters:
@@ -530,12 +479,9 @@ user_sent_keep_alive(HostType, JID) ->
     To :: jid:jid(),
     Packet :: exml:element(),
     Result :: mongoose_acc:t().
-user_send_packet(Acc, From, To, Packet) ->
-    Params = #{},
-    Args = [From, To, Packet],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
+user_send_packet(Acc, _From, _To, _Packet) ->
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(user_send_packet, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(user_send_packet, HostType, Acc, #{}).
 
 %%% @doc The `vcard_set' hook is called to inform that the vcard
 %%% has been set in mod_vcard backend.
@@ -555,9 +501,7 @@ vcard_set(HostType, Server, LUser, VCard) ->
     Result :: mongoose_acc:t().
 xmpp_send_element(HostType, Acc, El) ->
     Params = #{el => El},
-    Args = [El],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(xmpp_send_element, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(xmpp_send_element, HostType, Acc, Params).
 
 %%% @doc The `xmpp_stanza_dropped' hook is called to inform that
 %%% an xmpp stanza has been dropped.
@@ -569,10 +513,8 @@ xmpp_send_element(HostType, Acc, El) ->
     Result :: any().
 xmpp_stanza_dropped(Acc, From, To, Packet) ->
     Params = #{from => From, to => To, packet => Packet},
-    Args = [From, To, Packet],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(xmpp_stanza_dropped, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(xmpp_stanza_dropped, HostType, Acc, Params).
 
 %% C2S related hooks
 
@@ -584,10 +526,8 @@ xmpp_stanza_dropped(Acc, From, To, Packet) ->
     Result :: [jid:simple_jid()].
 c2s_broadcast_recipients(State, Type, From, Packet) ->
     Params = #{state => State, type => Type, from => From, packet => Packet},
-    Args = [State, Type, From, Packet],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = ejabberd_c2s_state:host_type(State),
-    run_hook_for_host_type(c2s_broadcast_recipients, HostType, [], ParamsWithLegacyArgs).
+    run_hook_for_host_type(c2s_broadcast_recipients, HostType, [], Params).
 
 -spec c2s_filter_packet(State, Feature, To, Packet) -> Result when
     State :: ejabberd_c2s:state(),
@@ -597,10 +537,8 @@ c2s_broadcast_recipients(State, Type, From, Packet) ->
     Result :: boolean().
 c2s_filter_packet(State, Feature, To, Packet) ->
     Params = #{state => State, feature => Feature, to => To, packet => Packet},
-    Args = [State, Feature, To, Packet],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = ejabberd_c2s_state:host_type(State),
-    run_hook_for_host_type(c2s_filter_packet, HostType, true, ParamsWithLegacyArgs).
+    run_hook_for_host_type(c2s_filter_packet, HostType, true, Params).
 
 -spec c2s_preprocessing_hook(HostType, Acc, State) -> Result when
     HostType :: mongooseim:host_type(),
@@ -609,9 +547,7 @@ c2s_filter_packet(State, Feature, To, Packet) ->
     Result :: mongoose_acc:t().
 c2s_preprocessing_hook(HostType, Acc, State) ->
     Params = #{state => State},
-    Args = [State],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(c2s_preprocessing_hook, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(c2s_preprocessing_hook, HostType, Acc, Params).
 
 -spec c2s_presence_in(State, From, To, Packet) -> Result when
     State :: ejabberd_c2s:state(),
@@ -621,10 +557,8 @@ c2s_preprocessing_hook(HostType, Acc, State) ->
     Result :: ejabberd_c2s:state().
 c2s_presence_in(State, From, To, Packet) ->
     Params = #{from => From, to => To, packet => Packet},
-    Args = [From, To, Packet],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = ejabberd_c2s_state:host_type(State),
-    run_hook_for_host_type(c2s_presence_in, HostType, State, ParamsWithLegacyArgs).
+    run_hook_for_host_type(c2s_presence_in, HostType, State, Params).
 
 -spec c2s_stream_features(HostType, LServer) -> Result when
     HostType :: mongooseim:host_type(),
@@ -632,9 +566,7 @@ c2s_presence_in(State, From, To, Packet) ->
     Result :: [exml:element()].
 c2s_stream_features(HostType, LServer) ->
     Params = #{lserver => LServer},
-    Args = [HostType, LServer],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(c2s_stream_features, HostType, [], ParamsWithLegacyArgs).
+    run_hook_for_host_type(c2s_stream_features, HostType, [], Params).
 
 -spec c2s_unauthenticated_iq(HostType, Server, IQ, IP) -> Result when
     HostType :: mongooseim:host_type(),
@@ -644,9 +576,7 @@ c2s_stream_features(HostType, LServer) ->
     Result :: exml:element() | empty.
 c2s_unauthenticated_iq(HostType, Server, IQ, IP) ->
     Params = #{server => Server, iq => IQ, ip => IP},
-    Args = [HostType, Server, IQ, IP],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(c2s_unauthenticated_iq, HostType, empty, ParamsWithLegacyArgs).
+    run_hook_for_host_type(c2s_unauthenticated_iq, HostType, empty, Params).
 
 -spec c2s_update_presence(HostType, Acc) -> Result when
     HostType :: mongooseim:host_type(),
@@ -689,12 +619,9 @@ session_opening_allowed_for_user(HostType, JID) ->
 privacy_check_packet(Acc, JID, PrivacyList, FromToNameType, Dir) ->
     Params = #{jid => JID, privacy_list => PrivacyList,
                from_to_name_type => FromToNameType, dir => Dir},
-    Args = [JID, PrivacyList, FromToNameType, Dir],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
     AccWithRes = mongoose_acc:set(hook, result, allow, Acc),
-    run_hook_for_host_type(privacy_check_packet, HostType, AccWithRes,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(privacy_check_packet, HostType, AccWithRes, Params).
 
 -spec privacy_get_user_list(HostType, JID) -> Result when
     HostType :: mongooseim:host_type(),
@@ -702,9 +629,7 @@ privacy_check_packet(Acc, JID, PrivacyList, FromToNameType, Dir) ->
     Result :: mongoose_privacy:userlist().
 privacy_get_user_list(HostType, JID) ->
     Params = #{jid => JID},
-    Args = [HostType, JID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(privacy_get_user_list, HostType, #userlist{}, ParamsWithLegacyArgs).
+    run_hook_for_host_type(privacy_get_user_list, HostType, #userlist{}, Params).
 
 -spec privacy_iq_get(HostType, Acc, From, To, IQ, PrivList) -> Result when
     HostType :: mongooseim:host_type(),
@@ -716,9 +641,7 @@ privacy_get_user_list(HostType, JID) ->
     Result :: mongoose_acc:t().
 privacy_iq_get(HostType, Acc, From, To, IQ, PrivList) ->
     Params = #{from => From, to => To, iq => IQ, priv_list => PrivList},
-    Args = [From, To, IQ, PrivList],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(privacy_iq_get, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(privacy_iq_get, HostType, Acc, Params).
 
 -spec privacy_iq_set(HostType, Acc, From, To, IQ) -> Result when
     HostType :: mongooseim:host_type(),
@@ -729,9 +652,7 @@ privacy_iq_get(HostType, Acc, From, To, IQ, PrivList) ->
     Result :: mongoose_acc:t().
 privacy_iq_set(HostType, Acc, From, To, IQ) ->
     Params = #{from => From, to => To, iq => IQ},
-    Args = [From, To, IQ],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(privacy_iq_set, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(privacy_iq_set, HostType, Acc, Params).
 
 -spec privacy_updated_list(HostType, OldList, NewList) -> Result when
     HostType :: mongooseim:host_type(),
@@ -740,9 +661,7 @@ privacy_iq_set(HostType, Acc, From, To, IQ) ->
     Result :: false | mongoose_privacy:userlist().
 privacy_updated_list(HostType, OldList, NewList) ->
     Params = #{old_list => OldList, new_list => NewList},
-    Args = [OldList, NewList],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(privacy_updated_list, HostType, false, ParamsWithLegacyArgs).
+    run_hook_for_host_type(privacy_updated_list, HostType, false, Params).
 
 %% Session management related hooks
 
@@ -754,10 +673,8 @@ privacy_updated_list(HostType, OldList, NewList) ->
     Result :: mongoose_acc:t().
 offline_groupchat_message_hook(Acc, From, To, Packet) ->
     Params = #{from => From, to => To, packet => Packet},
-    Args = [From, To, Packet],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(offline_groupchat_message_hook, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(offline_groupchat_message_hook, HostType, Acc, Params).
 
 -spec offline_message_hook(Acc, From, To, Packet) -> Result when
     Acc :: mongoose_acc:t(),
@@ -767,10 +684,8 @@ offline_groupchat_message_hook(Acc, From, To, Packet) ->
     Result :: mongoose_acc:t().
 offline_message_hook(Acc, From, To, Packet) ->
     Params = #{from => From, to => To, packet => Packet},
-    Args = [From, To, Packet],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(offline_message_hook, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(offline_message_hook, HostType, Acc, Params).
 
 -spec set_presence_hook(Acc, JID, Presence) -> Result when
     Acc :: mongoose_acc:t(),
@@ -792,10 +707,8 @@ set_presence_hook(Acc, JID, Presence) ->
     Result :: mongoose_acc:t().
 sm_broadcast(Acc, From, To, Broadcast, SessionCount) ->
     Params = #{from => From, to => To, broadcast => Broadcast, session_count => SessionCount},
-    Args = [From, To, Broadcast, SessionCount],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(sm_broadcast, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(sm_broadcast, HostType, Acc, Params).
 
 -spec sm_filter_offline_message(HostType, From, To, Packet) -> Result when
     HostType :: mongooseim:host_type(),
@@ -805,10 +718,7 @@ sm_broadcast(Acc, From, To, Broadcast, SessionCount) ->
     Result :: boolean().
 sm_filter_offline_message(HostType, From, To, Packet) ->
     Params = #{from => From, to => To, packet => Packet},
-    Args = [From, To, Packet],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(sm_filter_offline_message, HostType, false,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(sm_filter_offline_message, HostType, false, Params).
 
 -spec sm_register_connection_hook(HostType, SID, JID, Info) -> Result when
     HostType :: mongooseim:host_type(),
@@ -818,10 +728,7 @@ sm_filter_offline_message(HostType, From, To, Packet) ->
     Result :: ok.
 sm_register_connection_hook(HostType, SID, JID, Info) ->
     Params = #{sid => SID, jid => JID, info => Info},
-    Args = [HostType, SID, JID, Info],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(sm_register_connection_hook, HostType, ok,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(sm_register_connection_hook, HostType, ok, Params).
 
 -spec sm_remove_connection_hook(Acc, SID, JID, Info, Reason) -> Result when
     Acc :: mongoose_acc:t(),
@@ -832,11 +739,8 @@ sm_register_connection_hook(HostType, SID, JID, Info) ->
     Result :: mongoose_acc:t().
 sm_remove_connection_hook(Acc, SID, JID, Info, Reason) ->
     Params = #{sid => SID, jid => JID, info => Info, reason => Reason},
-    Args = [SID, JID, Info, Reason],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(sm_remove_connection_hook, HostType, Acc,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(sm_remove_connection_hook, HostType, Acc, Params).
 
 -spec unset_presence_hook(Acc, JID, Status) -> Result when
     Acc :: mongoose_acc:t(),
@@ -844,20 +748,16 @@ sm_remove_connection_hook(Acc, SID, JID, Info, Reason) ->
     Status :: binary(),
     Result :: mongoose_acc:t().
 unset_presence_hook(Acc, JID, Status) ->
-    #jid{luser = LUser, lserver = LServer, lresource = LResource} = JID,
     Params = #{jid => JID, status => Status},
-    Args = [LUser, LServer, LResource, Status],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(unset_presence_hook, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(unset_presence_hook, HostType, Acc, Params).
 
 -spec xmpp_bounce_message(Acc) -> Result when
     Acc :: mongoose_acc:t(),
     Result :: mongoose_acc:t().
 xmpp_bounce_message(Acc) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(xmpp_bounce_message, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(xmpp_bounce_message, HostType, Acc, #{}).
 
 %% Roster related hooks
 
@@ -868,10 +768,8 @@ xmpp_bounce_message(Acc) ->
     Result :: mongoose_acc:t().
 roster_get(Acc, JID) ->
     Params = #{jid => JID},
-    Args = [JID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(roster_get, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(roster_get, HostType, Acc, Params).
 
 %%% @doc The `roster_groups' hook is called to extract roster groups.
 -spec roster_groups(LServer) -> Result when
@@ -895,9 +793,7 @@ roster_groups(LServer) ->
       Result :: {mod_roster:subscription_state(), [binary()]}.
 roster_get_jid_info(HostType, ToJID, RemBareJID) ->
     Params = #{to => ToJID, remote => RemBareJID},
-    Args = [HostType, ToJID, RemBareJID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(roster_get_jid_info, HostType, {none, []}, ParamsWithLegacyArgs).
+    run_hook_for_host_type(roster_get_jid_info, HostType, {none, []}, Params).
 
 %%% @doc The `roster_get_subscription_lists' hook is called to extract
 %%% user's subscription list.
@@ -909,9 +805,7 @@ roster_get_jid_info(HostType, ToJID, RemBareJID) ->
 roster_get_subscription_lists(HostType, Acc, JID) ->
     BareJID = jid:to_bare(JID),
     Params = #{jid => BareJID},
-    Args = [BareJID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(roster_get_subscription_lists, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(roster_get_subscription_lists, HostType, Acc, Params).
 
 %%% @doc The `roster_get_versioning_feature' hook is
 %%% called to determine if roster versioning is enabled.
@@ -919,9 +813,7 @@ roster_get_subscription_lists(HostType, Acc, JID) ->
     HostType :: mongooseim:host_type(),
     Result :: [exml:element()].
 roster_get_versioning_feature(HostType) ->
-    Args = [HostType],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, Args),
-    run_hook_for_host_type(roster_get_versioning_feature, HostType, [], ParamsWithLegacyArgs).
+    run_hook_for_host_type(roster_get_versioning_feature, HostType, [], #{}).
 
 %%% @doc The `roster_in_subscription' hook is called to determine
 %%% if a subscription presence is routed to a user.
@@ -935,10 +827,8 @@ roster_get_versioning_feature(HostType) ->
 roster_in_subscription(Acc, To, From, Type, Reason) ->
     ToJID = jid:to_bare(To),
     Params = #{to => ToJID, from => From, type => Type, reason => Reason},
-    Args = [ToJID, From, Type, Reason],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(roster_in_subscription, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(roster_in_subscription, HostType, Acc, Params).
 
 %%% @doc The `roster_out_subscription' hook is called
 %%% when a user sends out subscription.
@@ -951,10 +841,8 @@ roster_in_subscription(Acc, To, From, Type, Reason) ->
 roster_out_subscription(Acc, From, To, Type) ->
     FromJID = jid:to_bare(From),
     Params = #{to => To, from => FromJID, type => Type},
-    Args = [FromJID, To, Type],
     HostType = mongoose_acc:host_type(Acc),
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(roster_out_subscription, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(roster_out_subscription, HostType, Acc, Params).
 
 %%% @doc The `roster_process_item' hook is called when a user's roster is set.
 -spec roster_process_item(HostType, LServer, Item) -> Result when
@@ -964,9 +852,7 @@ roster_out_subscription(Acc, From, To, Type) ->
     Result :: mod_roster:roster().
 roster_process_item(HostType, LServer, Item) ->
     Params = #{lserver => LServer},
-    Args = [LServer],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(roster_process_item, HostType, Item, ParamsWithLegacyArgs).
+    run_hook_for_host_type(roster_process_item, HostType, Item, Params).
 
 %%% @doc The `roster_push' hook is called when a roster item is
 %%% being pushed and roster versioning is not enabled.
@@ -977,9 +863,7 @@ roster_process_item(HostType, LServer, Item) ->
     Result :: any().
 roster_push(HostType, From, Item) ->
     Params = #{from => From, item => Item},
-    Args = [HostType, From, Item],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(roster_push, HostType, ok, ParamsWithLegacyArgs).
+    run_hook_for_host_type(roster_push, HostType, ok, Params).
 
 %%% @doc The `roster_set' hook is called when a user's roster is set through an IQ.
 -spec roster_set(HostType, From, To, SubEl) -> Result when
@@ -990,9 +874,7 @@ roster_push(HostType, From, Item) ->
     Result :: any().
 roster_set(HostType, From, To, SubEl) ->
     Params = #{from => From, to => To, sub_el => SubEl},
-    Args = [From, To, SubEl],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(roster_set, HostType, ok, ParamsWithLegacyArgs).
+    run_hook_for_host_type(roster_set, HostType, ok, Params).
 
 %% MUC related hooks
 
@@ -1011,9 +893,7 @@ roster_set(HostType, From, To, SubEl) ->
       Result :: boolean().
 is_muc_room_owner(HostType, Acc, Room, User) ->
     Params = #{acc => Acc, room => Room, user => User},
-    Args = [Acc, Room, User],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(is_muc_room_owner, HostType, false, ParamsWithLegacyArgs).
+    run_hook_for_host_type(is_muc_room_owner, HostType, false, Params).
 
 %%% @doc The `can_access_identity' hook is called to determine if
 %%% a given user can see the real identity of the people in a room.
@@ -1024,9 +904,7 @@ is_muc_room_owner(HostType, Acc, Room, User) ->
       Result :: boolean().
 can_access_identity(HostType, Room, User) ->
     Params = #{room => Room, user => User},
-    Args = [HostType, Room, User],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(can_access_identity, HostType, false, ParamsWithLegacyArgs).
+    run_hook_for_host_type(can_access_identity, HostType, false, Params).
 
 %%% @doc The `can_access_room' hook is called to determine
 %%% if a given user can access a room.
@@ -1038,9 +916,7 @@ can_access_identity(HostType, Room, User) ->
       Result :: boolean().
 can_access_room(HostType, Acc, Room, User) ->
     Params = #{acc => Acc, room => Room, user => User},
-    Args = [Acc, Room, User],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(can_access_room, HostType, false, ParamsWithLegacyArgs).
+    run_hook_for_host_type(can_access_room, HostType, false, Params).
 
 -spec acc_room_affiliations(Acc, Room) -> NewAcc when
       Acc :: mongoose_acc:t(),
@@ -1048,10 +924,8 @@ can_access_room(HostType, Acc, Room, User) ->
       NewAcc :: mongoose_acc:t().
 acc_room_affiliations(Acc, Room) ->
     Params = #{room => Room},
-    Args = [Room],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mod_muc_light_utils:acc_to_host_type(Acc),
-    run_hook_for_host_type(acc_room_affiliations, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(acc_room_affiliations, HostType, Acc, Params).
 
 -spec room_exists(HostType, Room) -> Result when
       HostType :: mongooseim:host_type(),
@@ -1059,9 +933,7 @@ acc_room_affiliations(Acc, Room) ->
       Result :: boolean().
 room_exists(HostType, Room) ->
     Params = #{room => Room},
-    Args = [HostType, Room],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(room_exists, HostType, false, ParamsWithLegacyArgs).
+    run_hook_for_host_type(room_exists, HostType, false, Params).
 
 -spec room_new_affiliations(Acc, Room, NewAffs, Version) -> NewAcc when
       Acc :: mongoose_acc:t(),
@@ -1071,10 +943,8 @@ room_exists(HostType, Room) ->
       NewAcc :: mongoose_acc:t().
 room_new_affiliations(Acc, Room, NewAffs, Version) ->
     Params = #{room => Room, new_affs => NewAffs, version => Version},
-    Args = [Room, NewAffs, Version],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mod_muc_light_utils:acc_to_host_type(Acc),
-    run_hook_for_host_type(room_new_affiliations, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(room_new_affiliations, HostType, Acc, Params).
 
 %% MAM related hooks
 
@@ -1089,9 +959,7 @@ room_new_affiliations(Acc, Room, NewAffs, Version) ->
       Result :: undefined | mod_mam:archive_id().
 mam_archive_id(HostType, Owner) ->
     Params = #{owner => Owner},
-    Args = [HostType, Owner],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_archive_id, HostType, undefined, ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_archive_id, HostType, undefined, Params).
 
 %%% @doc The `mam_archive_size' hook is called to determine the size
 %%% of the archive for a given JID
@@ -1102,10 +970,7 @@ mam_archive_id(HostType, Owner) ->
       Result :: integer().
 mam_archive_size(HostType, ArchiveID, Owner) ->
     Params = #{archive_id => ArchiveID, owner => Owner},
-    Args = [HostType, ArchiveID, Owner],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_archive_size, HostType, 0,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_archive_size, HostType, 0, Params).
 
 %%% @doc The `mam_get_behaviour' hooks is called to determine if a message
 %%% should be archived or not based on a given pair of JIDs.
@@ -1118,10 +983,7 @@ mam_archive_size(HostType, ArchiveID, Owner) ->
       Result :: mod_mam:archive_behaviour().
 mam_get_behaviour(HostType, ArchiveID, Owner, Remote) ->
     Params = #{archive_id => ArchiveID, owner => Owner, remote => Remote},
-    Args = [HostType, ArchiveID, Owner, Remote],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_get_behaviour, HostType, always,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_get_behaviour, HostType, always, Params).
 
 %%% @doc The `mam_set_prefs' hook is called to set a user's archive preferences.
 %%%
@@ -1138,11 +1000,7 @@ mam_get_behaviour(HostType, ArchiveID, Owner, Remote) ->
 mam_set_prefs(HostType,  ArchiveID, Owner, DefaultMode, AlwaysJIDs, NeverJIDs) ->
     Params = #{archive_id => ArchiveID, owner => Owner,
                default_mode => DefaultMode, always_jids => AlwaysJIDs, never_jids => NeverJIDs},
-    Args = [HostType, ArchiveID, Owner,
-            DefaultMode, AlwaysJIDs, NeverJIDs],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_set_prefs, HostType, {error, not_implemented},
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_set_prefs, HostType, {error, not_implemented}, Params).
 
 %%% @doc The `mam_get_prefs' hook is called to read
 %%% the archive settings for a given user.
@@ -1154,11 +1012,8 @@ mam_set_prefs(HostType,  ArchiveID, Owner, DefaultMode, AlwaysJIDs, NeverJIDs) -
       Result :: mod_mam:preference() | {error, Reason :: term()}.
 mam_get_prefs(HostType, DefaultMode, ArchiveID, Owner) ->
     Params = #{archive_id => ArchiveID, owner => Owner},
-    Args = [HostType, ArchiveID, Owner],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     InitialAccValue = {DefaultMode, [], []}, %% mod_mam:preference() type
-    run_hook_for_host_type(mam_get_prefs, HostType, InitialAccValue,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_get_prefs, HostType, InitialAccValue, Params).
 
 %%% @doc The `mam_remove_archive' hook is called in order to
 %%% remove the entire archive for a particular user.
@@ -1168,10 +1023,7 @@ mam_get_prefs(HostType, DefaultMode, ArchiveID, Owner) ->
       Owner :: jid:jid().
 mam_remove_archive(HostType, ArchiveID, Owner) ->
     Params = #{archive_id => ArchiveID, owner => Owner},
-    Args = [HostType, ArchiveID, Owner],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_remove_archive, HostType, ok,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_remove_archive, HostType, ok, Params).
 
 %%% @doc The `mam_lookup_messages' hook is to retrieve
 %%% archived messages for given search parameters.
@@ -1180,11 +1032,9 @@ mam_remove_archive(HostType, ArchiveID, Owner) ->
       Params :: map(),
       Result :: {ok, mod_mam:lookup_result()}.
 mam_lookup_messages(HostType, Params) ->
-    Args = [HostType, Params],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     InitialLookupValue = {0, 0, []}, %% mod_mam:lookup_result() type
     run_hook_for_host_type(mam_lookup_messages, HostType, {ok, InitialLookupValue},
-                           ParamsWithLegacyArgs).
+                           Params).
 
 %%% @doc The `mam_archive_message' hook is called in order
 %%% to store the message in the archive.
@@ -1194,9 +1044,7 @@ mam_lookup_messages(HostType, Params) ->
     Params :: mod_mam:archive_message_params(),
     Result :: ok | {error, timeout}.
 mam_archive_message(HostType, Params) ->
-    Args = [HostType, Params],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_archive_message, HostType, ok, ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_archive_message, HostType, ok, Params).
 
 %%% @doc The `mam_flush_messages' hook is run after the async bulk write
 %%% happens for messages despite the result of the write.
@@ -1204,17 +1052,12 @@ mam_archive_message(HostType, Params) ->
                          MessageCount :: integer()) -> ok.
 mam_flush_messages(HostType, MessageCount) ->
     Params = #{count => MessageCount},
-    Args = [HostType, MessageCount],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_flush_messages, HostType, ok,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_flush_messages, HostType, ok, Params).
 
 %% @doc Waits until all pending messages are written
 -spec mam_archive_sync(HostType :: mongooseim:host_type()) -> ok.
 mam_archive_sync(HostType) ->
-    Args = [HostType],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, Args),
-    run_hook_for_host_type(mam_archive_sync, HostType, ok, ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_archive_sync, HostType, ok, #{}).
 
 %% @doc Notifies of a message retraction
 -spec mam_retraction(mongooseim:host_type(),
@@ -1222,7 +1065,7 @@ mam_archive_sync(HostType) ->
                      mod_mam:archive_message_params()) ->
     mod_mam_utils:retraction_info().
 mam_retraction(HostType, RetractionInfo, Env) ->
-    run_fold(mam_retraction, HostType, RetractionInfo, Env).
+    run_hook_for_host_type(mam_retraction, HostType, RetractionInfo, Env).
 
 %% MAM MUC related hooks
 
@@ -1243,10 +1086,7 @@ mam_retraction(HostType, RetractionInfo, Env) ->
       Result :: undefined | mod_mam:archive_id().
 mam_muc_archive_id(HostType, Owner) ->
     Params = #{owner => Owner},
-    Args = [HostType, Owner],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_muc_archive_id, HostType, undefined,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_muc_archive_id, HostType, undefined, Params).
 
 %%% @doc The `mam_muc_archive_size' hook is called to determine
 %%% the archive size for a given room.
@@ -1257,9 +1097,7 @@ mam_muc_archive_id(HostType, Owner) ->
       Result :: integer().
 mam_muc_archive_size(HostType, ArchiveID, Room) ->
     Params = #{archive_id => ArchiveID, room => Room},
-    Args = [HostType, ArchiveID, Room],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_muc_archive_size, HostType, 0, ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_muc_archive_size, HostType, 0, Params).
 
 %%% @doc The `mam_muc_get_behaviour' hooks is called to determine if a message should
 %%% be archived or not based on the given room and user JIDs.
@@ -1272,11 +1110,8 @@ mam_muc_archive_size(HostType, ArchiveID, Room) ->
       Result :: mod_mam:archive_behaviour().
 mam_muc_get_behaviour(HostType, ArchiveID, Room, Remote) ->
     Params = #{archive_id => ArchiveID, room => Room, remote => Remote},
-    Args = [HostType, ArchiveID, Room, Remote],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     DefaultBehaviour = always, %% mod_mam:archive_behaviour() type
-    run_hook_for_host_type(mam_muc_get_behaviour, HostType, DefaultBehaviour,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_muc_get_behaviour, HostType, DefaultBehaviour, Params).
 
 %%% @doc The `mam_muc_set_prefs' hook is called to set a room's archive preferences.
 %%%
@@ -1293,12 +1128,8 @@ mam_muc_get_behaviour(HostType, ArchiveID, Room, Remote) ->
 mam_muc_set_prefs(HostType, ArchiveID, Room, DefaultMode, AlwaysJIDs, NeverJIDs) ->
     Params = #{archive_id => ArchiveID, room => Room, default_mode => DefaultMode,
                always_jids => AlwaysJIDs, never_jids => NeverJIDs},
-    Args = [HostType, ArchiveID, Room, DefaultMode,
-            AlwaysJIDs, NeverJIDs],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     InitialAcc = {error, not_implemented},
-    run_hook_for_host_type(mam_muc_set_prefs, HostType, InitialAcc,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_muc_set_prefs, HostType, InitialAcc, Params).
 
 %%% @doc The `mam_muc_get_prefs' hook is called to read
 %%% the archive settings for a given room.
@@ -1310,11 +1141,8 @@ mam_muc_set_prefs(HostType, ArchiveID, Room, DefaultMode, AlwaysJIDs, NeverJIDs)
       Result :: mod_mam:preference() | {error, Reason :: term()}.
 mam_muc_get_prefs(HostType, DefaultMode, ArchiveID, Room) ->
     Params = #{archive_id => ArchiveID, room => Room},
-    Args = [HostType, ArchiveID, Room],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     InitialAcc = {DefaultMode, [], []}, %% mod_mam:preference() type
-    run_hook_for_host_type(mam_muc_get_prefs, HostType, InitialAcc,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_muc_get_prefs, HostType, InitialAcc, Params).
 
 %%% @doc The `mam_muc_remove_archive' hook is called in order to remove the entire
 %%% archive for a particular user.
@@ -1324,10 +1152,7 @@ mam_muc_get_prefs(HostType, DefaultMode, ArchiveID, Room) ->
       Room :: jid:jid().
 mam_muc_remove_archive(HostType, ArchiveID, Room) ->
     Params = #{archive_id => ArchiveID, room => Room},
-    Args = [HostType, ArchiveID, Room],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_muc_remove_archive, HostType, ok,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_muc_remove_archive, HostType, ok, Params).
 
 %%% @doc The `mam_muc_lookup_messages' hook is to retrieve archived
 %%% MUC messages for any given search parameters.
@@ -1336,11 +1161,9 @@ mam_muc_remove_archive(HostType, ArchiveID, Room) ->
       Params :: map(),
       Result :: {ok, mod_mam:lookup_result()}.
 mam_muc_lookup_messages(HostType, Params) ->
-    Args = [HostType, Params],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     InitialLookupValue = {0, 0, []}, %% mod_mam:lookup_result() type
     run_hook_for_host_type(mam_muc_lookup_messages, HostType, {ok, InitialLookupValue},
-                           ParamsWithLegacyArgs).
+                           Params).
 
 %%% @doc The `mam_muc_archive_message' hook is called in order
 %%% to store the MUC message in the archive.
@@ -1349,9 +1172,7 @@ mam_muc_lookup_messages(HostType, Params) ->
     Params :: mod_mam:archive_message_params(),
     Result :: ok | {error, timeout}.
 mam_muc_archive_message(HostType, Params) ->
-    Args = [HostType, Params],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_muc_archive_message, HostType, ok, ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_muc_archive_message, HostType, ok, Params).
 
 %%% @doc The `mam_muc_flush_messages' hook is run after the async bulk write
 %%% happens for MUC messages despite the result of the write.
@@ -1359,17 +1180,12 @@ mam_muc_archive_message(HostType, Params) ->
                              MessageCount :: integer()) -> ok.
 mam_muc_flush_messages(HostType, MessageCount) ->
     Params = #{count => MessageCount},
-    Args = [HostType, MessageCount],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mam_muc_flush_messages, HostType, ok,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_muc_flush_messages, HostType, ok, Params).
 
 %% @doc Waits until all pending messages are written
 -spec mam_muc_archive_sync(HostType :: mongooseim:host_type()) -> ok.
 mam_muc_archive_sync(HostType) ->
-    Args = [HostType],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, Args),
-    run_hook_for_host_type(mam_muc_archive_sync, HostType, ok, ParamsWithLegacyArgs).
+    run_hook_for_host_type(mam_muc_archive_sync, HostType, ok, #{}).
 
 %% @doc Notifies of a muc message retraction
 -spec mam_muc_retraction(mongooseim:host_type(),
@@ -1377,7 +1193,7 @@ mam_muc_archive_sync(HostType) ->
                          mod_mam:archive_message_params()) ->
     mod_mam_utils:retraction_info().
 mam_muc_retraction(HostType, RetractionInfo, Env) ->
-    run_fold(mam_muc_retraction, HostType, RetractionInfo, Env).
+    run_hook_for_host_type(mam_muc_retraction, HostType, RetractionInfo, Env).
 
 %% GDPR related hooks
 
@@ -1389,9 +1205,7 @@ mam_muc_retraction(HostType, RetractionInfo, Env) ->
       Result :: ejabberd_gen_mam_archive:mam_pm_gdpr_data().
 get_mam_pm_gdpr_data(HostType, JID) ->
     Params = #{jid => JID},
-    Args = [HostType, JID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(get_mam_pm_gdpr_data, HostType, [], ParamsWithLegacyArgs).
+    run_hook_for_host_type(get_mam_pm_gdpr_data, HostType, [], Params).
 
 %%% @doc `get_mam_muc_gdpr_data' hook is called to provide
 %%% a user's archive for GDPR purposes.
@@ -1401,9 +1215,7 @@ get_mam_pm_gdpr_data(HostType, JID) ->
       Result :: ejabberd_gen_mam_archive:mam_muc_gdpr_data().
 get_mam_muc_gdpr_data(HostType, JID) ->
     Params = #{jid => JID},
-    Args = [HostType, JID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(get_mam_muc_gdpr_data, HostType, [], ParamsWithLegacyArgs).
+    run_hook_for_host_type(get_mam_muc_gdpr_data, HostType, [], Params).
 
 %%% @doc `get_personal_data' hook is called to retrieve
 %%% a user's personal data for GDPR purposes.
@@ -1413,9 +1225,7 @@ get_mam_muc_gdpr_data(HostType, JID) ->
     Result :: gdpr:personal_data().
 get_personal_data(HostType, JID) ->
     Params = #{jid => JID},
-    Args = [HostType, JID],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(get_personal_data, HostType, [], ParamsWithLegacyArgs).
+    run_hook_for_host_type(get_personal_data, HostType, [], Params).
 
 %% S2S related hooks
 
@@ -1466,9 +1276,7 @@ s2s_send_packet(Acc, From, To, Packet) ->
     Result :: [exml:element()].
 s2s_stream_features(HostType, LServer) ->
     Params = #{lserver => LServer},
-    Args = [HostType, LServer],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(s2s_stream_features, HostType, [], ParamsWithLegacyArgs).
+    run_hook_for_host_type(s2s_stream_features, HostType, [], Params).
 
 %%% @doc `s2s_receive_packet' hook is called when
 %%% an incoming stanza is routed by the server.
@@ -1484,28 +1292,24 @@ s2s_receive_packet(Acc) ->
 -spec disco_local_identity(mongoose_disco:identity_acc()) ->
     mongoose_disco:identity_acc().
 disco_local_identity(Acc = #{host_type := HostType}) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(disco_local_identity, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(disco_local_identity, HostType, Acc, #{}).
 
 %%% @doc `disco_sm_identity' hook is called to get the identity of the
 %%% client when a discovery IQ gets to session management.
 -spec disco_sm_identity(mongoose_disco:identity_acc()) -> mongoose_disco:identity_acc().
 disco_sm_identity(Acc = #{host_type := HostType}) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(disco_sm_identity, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(disco_sm_identity, HostType, Acc, #{}).
 
 %%% @doc `disco_local_items' hook is called to extract items associated with the server.
 -spec disco_local_items(mongoose_disco:item_acc()) -> mongoose_disco:item_acc().
 disco_local_items(Acc = #{host_type := HostType}) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(disco_local_items, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(disco_local_items, HostType, Acc, #{}).
 
 %%% @doc `disco_sm_items' hook is called to get the items associated
 %%% with the client when a discovery IQ gets to session management.
 -spec disco_sm_items(mongoose_disco:item_acc()) -> mongoose_disco:item_acc().
 disco_sm_items(Acc = #{host_type := HostType}) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(disco_sm_items, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(disco_sm_items, HostType, Acc, #{}).
 
 %%% @doc `disco_local_features' hook is called to extract features
 %%% offered by the server.
@@ -1517,21 +1321,18 @@ disco_local_features(Acc = #{host_type := HostType}) ->
 %%% when a discovery IQ gets to session management.
 -spec disco_sm_features(mongoose_disco:feature_acc()) -> mongoose_disco:feature_acc().
 disco_sm_features(Acc = #{host_type := HostType}) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(disco_sm_features, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(disco_sm_features, HostType, Acc, #{}).
 
 %%% @doc `disco_muc_features' hook is called to get the features
 %%% supported by the MUC (Light) service.
 -spec disco_muc_features(mongoose_disco:feature_acc()) -> mongoose_disco:feature_acc().
 disco_muc_features(Acc = #{host_type := HostType}) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(disco_muc_features, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(disco_muc_features, HostType, Acc, #{}).
 
 %%% @doc `disco_info' hook is called to extract information about the server.
 -spec disco_info(mongoose_disco:info_acc()) -> mongoose_disco:info_acc().
 disco_info(Acc = #{host_type := HostType}) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(disco_info, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(disco_info, HostType, Acc, #{}).
 
 %% AMP related hooks
 
@@ -1544,10 +1345,8 @@ disco_info(Acc = #{host_type := HostType}) ->
     Result :: mod_amp:amp_match_result().
 amp_check_condition(HostType, Strategy, Rule) ->
     Params = #{strategy => Strategy, rule => Rule},
-    Args = [Strategy, Rule],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     InitialAcc = no_match, %% mod_amp:amp_match_result() type
-    run_hook_for_host_type(amp_check_condition, HostType, InitialAcc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(amp_check_condition, HostType, InitialAcc, Params).
 
 %%% @doc The `amp_determine_strategy' hook is called when checking to determine
 %%% which strategy will be chosen when executing AMP rules.
@@ -1560,11 +1359,8 @@ amp_check_condition(HostType, Strategy, Rule) ->
     Result :: mod_amp:amp_strategy().
 amp_determine_strategy(HostType, From, To, Packet, Event) ->
     Params = #{from => From, to => To, packet => Packet, event => Event},
-    Args = [From, To, Packet, Event],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     DefaultStrategy = amp_strategy:null_strategy(),
-    run_hook_for_host_type(amp_determine_strategy, HostType, DefaultStrategy,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(amp_determine_strategy, HostType, DefaultStrategy, Params).
 
 %%% @doc The `amp_verify_support' hook is called when checking
 %%% whether the host supports given AMP rules.
@@ -1574,9 +1370,7 @@ amp_determine_strategy(HostType, From, To, Packet, Event) ->
     Result :: [mod_amp:amp_rule_support()].
 amp_verify_support(HostType, Rules) ->
     Params = #{rules => Rules},
-    Args = [Rules],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(amp_verify_support, HostType, [], ParamsWithLegacyArgs).
+    run_hook_for_host_type(amp_verify_support, HostType, [], Params).
 
 %% MUC and MUC Light related hooks
 
@@ -1587,9 +1381,7 @@ amp_verify_support(HostType, Rules) ->
     Result :: exml:element().
 filter_room_packet(HostType, Packet, EventData) ->
     Params = #{packet => Packet, event_data => EventData},
-    Args = [HostType, EventData],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(filter_room_packet, HostType, Packet, ParamsWithLegacyArgs).
+    run_hook_for_host_type(filter_room_packet, HostType, Packet, Params).
 
 %%% @doc The `forget_room' hook is called when a room is removed from the database.
 -spec forget_room(HostType, MucHost, Room) -> Result when
@@ -1599,9 +1391,7 @@ filter_room_packet(HostType, Packet, EventData) ->
     Result :: any().
 forget_room(HostType, MucHost, Room) ->
     Params = #{muc_host => MucHost, room => Room},
-    Args = [HostType, MucHost, Room],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(forget_room, HostType, #{}, ParamsWithLegacyArgs).
+    run_hook_for_host_type(forget_room, HostType, #{}, Params).
 
 -spec invitation_sent(HookServer, Host, RoomJID, From, To, Reason) -> Result when
     HookServer :: jid:server(),
@@ -1655,8 +1445,7 @@ room_packet(Server, FromNick, FromJID, JID, Packet) ->
     Info :: mod_muc_room:update_inbox_for_muc_payload(),
     Result :: mod_muc_room:update_inbox_for_muc_payload().
 update_inbox_for_muc(HostType, Info) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(update_inbox_for_muc, HostType, Info, ParamsWithLegacyArgs).
+    run_hook_for_host_type(update_inbox_for_muc, HostType, Info, #{}).
 
 %% Caps related hooks
 
@@ -1668,10 +1457,8 @@ update_inbox_for_muc(HostType, Info) ->
     Result :: mongoose_acc:t().
 caps_recognised(Acc, From, Pid, Features) ->
     Params = #{from => From, pid => Pid, features => Features},
-    Args = [From, Pid, Features],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
     HostType = mongoose_acc:host_type(Acc),
-    run_hook_for_host_type(caps_recognised, HostType, Acc, ParamsWithLegacyArgs).
+    run_hook_for_host_type(caps_recognised, HostType, Acc, Params).
 
 %% PubSub related hooks
 
@@ -1728,10 +1515,7 @@ pubsub_publish_item(Server, NodeId, Publisher, ServiceJID, ItemId, BrPayload) ->
     Result :: any().
 mod_global_distrib_known_recipient(GlobalHost, From, To, LocalHost) ->
     Params = #{from => From, to => To, target_host => LocalHost},
-    Args = [From, To, LocalHost],
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(Params, Args),
-    run_hook_for_host_type(mod_global_distrib_known_recipient, GlobalHost, ok,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mod_global_distrib_known_recipient, GlobalHost, ok, Params).
 
 %%% @doc The `mod_global_distrib_unknown_recipient' hook is called when
 %%% the recipient is unknown to `global_distrib'.
@@ -1740,9 +1524,7 @@ mod_global_distrib_known_recipient(GlobalHost, From, To, LocalHost) ->
     Info :: filter_packet_acc(),
     Result :: any().
 mod_global_distrib_unknown_recipient(GlobalHost, Info) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, []),
-    run_hook_for_host_type(mod_global_distrib_unknown_recipient, GlobalHost, Info,
-                           ParamsWithLegacyArgs).
+    run_hook_for_host_type(mod_global_distrib_unknown_recipient, GlobalHost, Info, #{}).
 
 
 %%%----------------------------------------------------------------------
@@ -1750,9 +1532,8 @@ mod_global_distrib_unknown_recipient(GlobalHost, Info) ->
 %%%----------------------------------------------------------------------
 run_global_hook(HookName, Acc, Params) when is_map(Params) ->
     run_fold(HookName, global, Acc, Params);
-run_global_hook(HookName, Acc, Args) when is_list(Args) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, Args),
-    run_fold(HookName, global, Acc, ParamsWithLegacyArgs).
+run_global_hook(_HookName, Acc, Args) when is_list(Args) ->
+    Acc.
 
 run_hook_for_host_type(HookName, undefined, Acc, Args) ->
     ?LOG_ERROR(#{what => undefined_host_type,
@@ -1762,10 +1543,9 @@ run_hook_for_host_type(HookName, undefined, Acc, Args) ->
 run_hook_for_host_type(HookName, HostType, Acc, Params) when is_binary(HostType),
                                                              is_map(Params) ->
     run_fold(HookName, HostType, Acc, Params);
-run_hook_for_host_type(HookName, HostType, Acc, Args) when is_binary(HostType),
+run_hook_for_host_type(_HookName, HostType, Acc, Args) when is_binary(HostType),
                                                            is_list(Args) ->
-    ParamsWithLegacyArgs = ejabberd_hooks:add_args(#{}, Args),
-    run_fold(HookName, HostType, Acc, ParamsWithLegacyArgs).
+    Acc.
 
 run_fold(HookName, HostType, Acc, Params) when is_map(Params) ->
     {_, RetValue} = gen_hook:run_fold(HookName, HostType, Acc, Params),
diff --git a/test/ejabberd_hooks_SUITE.erl b/test/ejabberd_hooks_SUITE.erl
deleted file mode 100644
index dc19574b28..0000000000
--- a/test/ejabberd_hooks_SUITE.erl
+++ /dev/null
@@ -1,261 +0,0 @@
--module(ejabberd_hooks_SUITE).
--compile([export_all, nowarn_export_all]).
-
--define(HOST, <<"localhost">>).
-
-all() ->
-    [
-      a_module_fun_can_be_added,
-      a_module_fun_can_be_removed,
-
-      hooks_run_launches_nullary_fun,
-      hooks_run_launches_unary_fun,
-      hooks_run_ignores_different_arity_funs,
-      hooks_run_stops_when_fun_returns_stop,
-
-      hooks_run_fold_folds_with_unary_fun,
-      hooks_run_fold_folds_with_binary_fun,
-      hooks_run_fold_passes_acc_along,
-      hooks_run_fold_stops_when_fun_returns_stop,
-      hooks_run_fold_preserves_order,
-
-      error_in_run_fold_is_ignored,
-      throw_in_run_fold_is_ignored,
-      exit_in_run_fold_is_ignored
-    ].
-
-init_per_suite(C) ->
-    application:ensure_all_started(exometer_core),
-    mongoose_config:set_opt(all_metrics_are_global, false),
-    C.
-
-end_per_suite(_C) ->
-    mongoose_config:unset_opt(all_metrics_are_global),
-    application:stop(exometer_core).
-
-a_module_fun_can_be_added(_) ->
-    given_hooks_started(),
-    given_module(hook_mod, fun_a, fun(_) -> ok end),
-
-    % when
-    ejabberd_hooks:add(test_run_hook, ?HOST, hook_mod, fun_a, 1),
-
-    FunEjabberdHooksWrapper = fun ejabberd_hooks:gen_hook_fn_wrapper/3,
-    % then
-    [{{test_run_hook, <<"localhost">>},
-      [{hook_handler, 1, FunEjabberdHooksWrapper,
-        #{function := fun_a, module := hook_mod}}]}] = get_hooks().
-
-a_module_fun_can_be_removed(_) ->
-    given_hooks_started(),
-    given_module(hook_mod, fun_nullary, fun() -> success0 end),
-    given_hook_added(test_run_hook, hook_mod, fun_nullary, 1),
-
-    % when
-    ejabberd_hooks:delete(test_run_hook, ?HOST, hook_mod, fun_nullary, 1),
-
-    % then
-    [{{test_run_hook,<<"localhost">>}, []}] = get_hooks().
-
-
-hooks_run_launches_nullary_fun(_) ->
-    given_hooks_started(),
-    given_module(hook_mod, fun_nullary, fun(_) -> #{result => success0} end),
-    given_hook_added(test_run_hook, hook_mod, fun_nullary, 1),
-
-    %% when
-    run_fold(test_run_hook, ?HOST, ok, []),
-
-    %% then
-    H = meck:history(hook_mod),
-    [{_,{hook_mod,fun_nullary,[ok]}, #{result := success0}}] = H.
-
-hooks_run_launches_unary_fun(_) ->
-    given_hooks_started(),
-    given_module(hook_mod, fun_onearg, fun(Acc, Val) -> Val end),
-    given_hook_added(test_run_hook, hook_mod, fun_onearg, 1),
-
-    %% when
-    run_fold(test_run_hook, ?HOST, ok, [oneval]),
-
-    %% then
-    [{_,{hook_mod,fun_onearg,[ok, oneval]}, oneval}] = meck:history(hook_mod).
-
-hooks_run_ignores_different_arity_funs(_) ->
-    given_hooks_started(),
-    given_module(hook_mod, fun_onearg, fun(ok, unused) -> never_return end),
-    given_fun(hook_mod, fun_twoarg, fun(ok, one, two)-> success2 end),
-
-    given_hook_added(test_run_hook, hook_mod, fun_onearg, 1),
-    given_hook_added(test_run_hook, hook_mod, fun_twoarg, 1),
-
-    %% when
-    run_fold(test_run_hook, ?HOST, ok, [one, two]),
-
-    %% then
-    [{_,{hook_mod, fun_twoarg, [ok, one, two]}, success2}] = meck:history(hook_mod).
-
-hooks_run_stops_when_fun_returns_stop(_) ->
-    given_hooks_started(),
-    given_module(hook_mod, a_fun, const(stop)),
-    given_fun(hook_mod, another_fun, const(success)),
-
-    given_hook_added(test_run_hook, hook_mod, a_fun, 1),
-    given_hook_added(test_run_hook, hook_mod, another_fun, 2),
-
-    %% when
-    run_fold(test_run_hook, ?HOST, ok, []),
-
-    %% then
-    [{_,{hook_mod,a_fun,[ok]}, stop}] = meck:history(hook_mod).
-
-
-hooks_run_fold_folds_with_unary_fun(_) ->
-    given_hooks_started(),
-    given_module(hook_mod, unary_folder, fun(initial) -> done end),
-    given_hook_added(test_fold_hook, hook_mod, unary_folder, 1),
-
-    %% when
-    run_fold(test_fold_hook, ?HOST, initial, []),
-
-    %% then
-    [{_,{hook_mod,unary_folder,[initial]}, done}] = meck:history(hook_mod).
-
-hooks_run_fold_folds_with_binary_fun(_) ->
-    given_hooks_started(),
-    given_module(hook_mod, binary_folder, fun(initial, arg1) -> done end),
-    given_hook_added(test_fold_hook, hook_mod, binary_folder, 1),
-
-    %% when
-    run_fold(test_fold_hook, ?HOST, initial, [arg1]),
-
-    %% then
-    [{_,{hook_mod,binary_folder,[initial, arg1]}, done}] = meck:history(hook_mod).
-
-hooks_run_fold_passes_acc_along(_) ->
-    given_hooks_started(),
-    given_module(hook_mod1, first_folder, fun(N, Const) -> N+Const end),
-    given_module(hook_mod2, second_folder, fun(N, Const) -> N-Const*2 end),
-
-    given_hook_added(test_fold_hook, hook_mod1, first_folder, 1),
-    given_hook_added(test_fold_hook, hook_mod2, second_folder, 2),
-
-    %% when
-    R = run_fold(test_fold_hook, ?HOST, 0, [10]),
-
-    %% then
-    -10 = R.
-
-hooks_run_fold_stops_when_fun_returns_stop(_) ->
-    given_hooks_started(),
-    given_module(hook_mod1, stopper, const(stop)),
-    given_module(hook_mod2, folder, const(continue)),
-
-    given_hook_added(test_fold_hook, hook_mod1, stopper, 1),
-    given_hook_added(test_fold_hook, hook_mod2, folder, 2),
-
-    %% when
-    R = run_fold(test_fold_hook, ?HOST, continue, []),
-
-    %% then
-    [{_,{hook_mod1,stopper,[continue]}, stop}] = meck:history(hook_mod1),
-    [] = meck:history(hook_mod2),
-    stopped = R.
-
-
-hooks_run_fold_preserves_order(_) ->
-    given_hooks_started(),
-    given_module(hook_mod1, first_folder, const(1)),
-    given_module(hook_mod2, second_folder, const(2)),
-
-    given_hook_added(test_fold_hook, hook_mod1, first_folder, 1),
-    given_hook_added(test_fold_hook, hook_mod2, second_folder, 2),
-
-    %% when
-    R = run_fold(test_fold_hook, ?HOST, 0, []),
-
-    %% then
-    2 = R.
-
-
-error_in_run_fold_is_ignored(_) ->
-    given_hooks_started(),
-
-    given_module(failing_mod, broken, fun(_) -> error(broken) end),
-    given_hook_added(test_fold_hook, failing_mod, broken, 1),
-
-    given_module(working_mod, good, const(i_was_run)),
-    given_hook_added(test_fold_hook, working_mod, good, 2),
-
-    %% when
-    R = run_fold(test_fold_hook, ?HOST, initial, []),
-
-    %% then
-    i_was_run = R,
-    [{_Pid, {failing_mod,broken,[initial]}, error,broken, _Stacktrace}] =
-        meck:history(failing_mod).
-
-
-throw_in_run_fold_is_ignored(_) ->
-    given_hooks_started(),
-
-    given_module(throwing_mod, throwing_fun, fun(_) -> throw(ball) end),
-    given_hook_added(test_fold_hook, throwing_mod, throwing_fun, 1),
-
-    given_module(working_mod, good, fun(X) -> X end),
-    given_hook_added(test_fold_hook, working_mod, good, 2),
-
-    %% when
-    R = run_fold(test_fold_hook, ?HOST, initial, []),
-
-    %% then
-    initial = R,
-    [{_Pid, {throwing_mod,throwing_fun,[initial]}, throw, ball, _ST}] =
-        meck:history(throwing_mod).
-
-
-exit_in_run_fold_is_ignored(_) ->
-    given_hooks_started(),
-
-    given_module(exiting_mod, exiting_fun,
-                 fun(_) -> meck:exception(exit,oops) end),
-    given_hook_added(test_fold_hook, exiting_mod, exiting_fun, 1),
-
-    given_module(working_mod, good, fun(X) -> X end),
-    given_hook_added(test_fold_hook, working_mod, good, 2),
-
-    %% when
-    R = run_fold(test_fold_hook, ?HOST, initial, []),
-
-    %% then
-    initial = R,
-    [{_Pid, {exiting_mod,exiting_fun,[initial]}, exit, oops, _ST}] =
-        meck:history(exiting_mod).
-
-
-
-
-%% Givens
-const(N) -> fun(_) -> N end.
-
-given_hooks_started() ->
-    gen_hook:start_link().
-
-given_hook_added(HookName, ModName, FunName, Prio) ->
-    ejabberd_hooks:add(HookName, ?HOST, ModName, FunName, Prio).
-
-given_module(ModName, FunName, Fun) ->
-    catch meck:unload(ModName),
-    meck:new(ModName, [non_strict]),
-    meck:expect(ModName, FunName, Fun).
-
-given_fun(ModName, FunName, Fun) ->
-    meck:expect(ModName, FunName, Fun).
-
-run_fold(HookName, HostType, Acc, Args) ->
-    Params = ejabberd_hooks:add_args(#{}, Args),
-    {_, RetValue} = gen_hook:run_fold(HookName, HostType, Acc, Params),
-    RetValue.
-
-get_hooks() ->
-    ets:tab2list(gen_hook).