diff --git a/src/emqx_access_control.erl b/src/emqx_access_control.erl
index 501d5f0db..1c577bf27 100644
--- a/src/emqx_access_control.erl
+++ b/src/emqx_access_control.erl
@@ -15,7 +15,6 @@
 -module(emqx_access_control).
 
 -include("emqx.hrl").
--include("logger.hrl").
 
 -export([authenticate/1]).
 
diff --git a/src/emqx_flapping.erl b/src/emqx_flapping.erl
index 4655a8ab3..099bf3910 100644
--- a/src/emqx_flapping.erl
+++ b/src/emqx_flapping.erl
@@ -15,7 +15,6 @@
 -module(emqx_flapping).
 
 -include("emqx.hrl").
--include("logger.hrl").
 -include("types.hrl").
 
 -behaviour(gen_statem).
diff --git a/src/emqx_rate_limiter.erl b/src/emqx_rate_limiter.erl
deleted file mode 100644
index 5298651a6..000000000
--- a/src/emqx_rate_limiter.erl
+++ /dev/null
@@ -1,70 +0,0 @@
-%% Copyright (c) 2013-2019 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-
--module(emqx_rate_limiter).
-
--behaviour(gen_server).
-
-%% API
--export([start_link/0]).
-
-%% gen_server callbacks
--export([ init/1
-        , handle_call/3
-        , handle_cast/2
-        , handle_info/2
-        , terminate/2
-        , code_change/3
-        ]).
-
--define(SERVER, ?MODULE).
-
--record(state, {}).
-
-%%------------------------------------------------------------------------------
-%%% API
-%%------------------------------------------------------------------------------
-
-%% @doc Starts the server
--spec(start_link() -> {ok, pid()} | ignore | {error, any()}).
-start_link() ->
-    gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
-
-%%------------------------------------------------------------------------------
-%%% gen_server callbacks
-%%------------------------------------------------------------------------------
-
-init([]) ->
-    {ok, #state{}}.
-
-handle_call(_Request, _From, State) ->
-    Reply = ok,
-    {reply, Reply, State}.
-
-handle_cast(_Msg, State) ->
-    {noreply, State}.
-
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%------------------------------------------------------------------------------
-%%% Internal functions
-%%------------------------------------------------------------------------------
-