diff --git a/Makefile b/Makefile
index 2c1693813..03bbef018 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ NO_AUTOPATCH = cuttlefish
 ERLC_OPTS += +debug_info -DAPPLICATION=emqx
 
 BUILD_DEPS = cuttlefish
-dep_cuttlefish = git-emqx https://github.com/emqx/cuttlefish v2.1.1
+dep_cuttlefish = git-emqx https://github.com/emqx/cuttlefish v2.2.0
 
 #TEST_DEPS = emqx_ct_helplers
 #dep_emqx_ct_helplers = git git@github.com:emqx/emqx-ct-helpers
diff --git a/etc/emqx.conf b/etc/emqx.conf
index f38cc1a13..19bd3f0e8 100644
--- a/etc/emqx.conf
+++ b/etc/emqx.conf
@@ -160,35 +160,6 @@ node.name = emqx@127.0.0.1
 ## Value: String
 node.cookie = emqxsecretcookie
 
-## Enable SMP support of Erlang VM.
-##
-## Value: enable | auto | disable
-node.smp = auto
-
-## Heartbeat monitoring of an Erlang runtime system. Comment the line to disable
-## heartbeat, or set the value as 'on'
-##
-## Value: on
-##
-## vm.args: -heart
-## node.heartbeat = on
-
-## Enable kernel poll.
-##
-## Value: on | off
-##
-## Default: on
-node.kernel_poll = on
-
-## Sets the number of threads in async thread pool. Valid range is 0-1024.
-##
-## See: http://erlang.org/doc/man/erl.html
-##
-## Value: 0-1024
-##
-## vm.args: +A Number
-node.async_threads = 32
-
 ## Sets the maximum number of simultaneously existing processes for this
 ## system if a Number is passed as value.
 ##
@@ -208,30 +179,6 @@ node.process_limit = 256000
 ## vm.args: +Q Number
 node.max_ports = 256000
 
-## Set the distribution buffer busy limit (dist_buf_busy_limit).
-##
-## See: http://erlang.org/doc/man/erl.html
-##
-## Value: Number [1KB-2GB]
-##
-## vm.args: +zdbbl size
-node.dist_buffer_size = 8MB
-
-## Sets the maximum number of ETS tables. Note that mnesia and SSL will
-## create temporary ETS tables.
-##
-## Value: Number
-##
-## vm.args: +e Number
-node.max_ets_tables = 256000
-
-## Tweak GC to run more often.
-##
-## Value: Number [0-65535]
-##
-## vm.args: -env ERL_FULLSWEEP_AFTER Number
-node.fullsweep_after = 1000
-
 ## Crash dump log file.
 ##
 ## Value: Log file
@@ -254,17 +201,6 @@ node.proto_dist = inet_tcp
 ## vm.args: -ssl_dist_optfile <File>
 ## node.ssl_dist_optfile = {{ platform_etc_dir }}/ssl_dist.conf
 
-## Sets the net_kernel tick time. TickTime is specified in seconds.
-## Notice that all communicating nodes are to have the same TickTime
-## value specified.
-##
-## See: http://www.erlang.org/doc/man/kernel_app.html#net_ticktime
-##
-## Value: Number
-##
-## vm.args: -kernel net_ticktime Number
-node.dist_net_ticktime = 60
-
 ## Sets the port range for the listener socket of a distributed Erlang node.
 ## Note that if there are firewalls between clustered nodes, this port segment
 ## for nodes’ communication should be allowed.
diff --git a/priv/emqx.schema b/priv/emqx.schema
index 93b27f0ae..1b48681ab 100644
--- a/priv/emqx.schema
+++ b/priv/emqx.schema
@@ -191,40 +191,6 @@ end}.
   {default, "emqxsecretcookie"}
 ]}.
 
-%% @doc SMP Support
-{mapping, "node.smp", "vm_args.-smp", [
-  {default, auto},
-  {datatype, {enum, [enable, auto, disable]}},
-  hidden
-]}.
-
-%% @doc http://erlang.org/doc/man/heart.html
-{mapping, "node.heartbeat", "vm_args.-heart", [
-  {datatype, flag},
-  hidden
-]}.
-
-{translation, "vm_args.-heart", fun(Conf) ->
-    case cuttlefish:conf_get("node.heartbeat", Conf) of
-        true  -> "";
-        false -> cuttlefish:invalid("should be 'on' or comment the line!")
-    end
-end}.
-
-%% @doc Enable Kernel Poll
-{mapping, "node.kernel_poll", "vm_args.+K", [
-  {default, on},
-  {datatype, flag},
-  hidden
-]}.
-
-%% @doc More information at: http://erlang.org/doc/man/erl.html
-{mapping, "node.async_threads", "vm_args.+A", [
-  {default, 64},
-  {datatype, integer},
-  {validators, ["range:0-1024"]}
-]}.
-
 %% @doc Erlang Process Limit
 {mapping, "node.process_limit", "vm_args.+P", [
   {datatype, integer},
@@ -245,53 +211,6 @@ end}.
 {validator, "range4ports", "must be 1024 to 134217727",
  fun(X) -> X >= 1024 andalso X =< 134217727 end}.
 
-%% @doc http://www.erlang.org/doc/man/erl.html#%2bzdbbl
-{mapping, "node.dist_buffer_size", "vm_args.+zdbbl", [
-  {datatype, bytesize},
-  {commented, "32MB"},
-  hidden,
-  {validators, ["zdbbl_range"]}
-]}.
-
-{translation, "vm_args.+zdbbl",
- fun(Conf) ->
-  ZDBBL = cuttlefish:conf_get("node.dist_buffer_size", Conf, undefined),
-  case ZDBBL of
-    undefined -> undefined;
-    X when is_integer(X) -> cuttlefish_util:ceiling(X / 1024); %% Bytes to Kilobytes;
-    _ -> undefined
-  end
- end
-}.
-
-{validator, "zdbbl_range", "must be between 1KB and 2097151KB",
- fun(ZDBBL) ->
-  %% 2097151KB = 2147482624
-  ZDBBL >= 1024 andalso ZDBBL =< 2147482624
- end
-}.
-
-%% @doc http://www.erlang.org/doc/man/erlang.html#system_flag-2
-{mapping, "node.fullsweep_after", "vm_args.-env ERL_FULLSWEEP_AFTER", [
-  {default, 1000},
-  {datatype, integer},
-  hidden,
-  {validators, ["positive_integer"]}
-]}.
-
-{validator, "positive_integer", "must be a positive integer",
-  fun(X) -> X >= 0 end}.
-
-%% Note: OTP R15 and earlier uses -env ERL_MAX_ETS_TABLES,
-%% R16+ uses +e
-%% @doc The ETS table limit
-{mapping, "node.max_ets_tables",
-  cuttlefish:otp("R16", "vm_args.+e", "vm_args.-env ERL_MAX_ETS_TABLES"), [
-  {default, 256000},
-  {datatype, integer},
-  hidden
-]}.
-
 %% @doc Set the location of crash dumps
 {mapping, "node.crash_dump", "vm_args.-env ERL_CRASH_DUMP", [
   {default, "{{crash_dump}}"},
@@ -299,13 +218,6 @@ end}.
   hidden
 ]}.
 
-%% @doc http://www.erlang.org/doc/man/kernel_app.html#net_ticktime
-{mapping, "node.dist_net_ticktime", "vm_args.-kernel net_ticktime", [
-  {commented, 60},
-  {datatype, integer},
-  hidden
-]}.
-
 %% @doc http://www.erlang.org/doc/man/kernel_app.html
 {mapping, "node.dist_listen_min", "kernel.inet_dist_listen_min", [
   {commented, 6369},