diff --git a/Makefile b/Makefile
index dddd1dba6..510517428 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ dep_gen_logger  = git https://github.com/emqtt/gen_logger
 dep_esockd      = git https://github.com/emqtt/esockd emq20
 dep_mochiweb    = git https://github.com/emqtt/mochiweb
 dep_clique      = git https://github.com/basho/clique
-dep_pbkdf2	= git https://github.com/basho/erlang-pbkdf2 2.0.0
+dep_pbkdf2	    = git https://github.com/basho/erlang-pbkdf2 2.0.0
 dep_time_compat = git https://github.com/lasp-lang/time_compat
 dep_rand_compat = git https://github.com/lasp-lang/rand_compat
 
@@ -37,6 +37,3 @@ include erlang.mk
 
 app:: rebar.config
 
-app.config::
-	cuttlefish -l info -e etc/ -c etc/emqttd.conf -i priv/emqttd.schema -d data
-
diff --git a/src/emqttd.app.src b/src/emqttd.app.src
deleted file mode 100644
index ecee62ea0..000000000
--- a/src/emqttd.app.src
+++ /dev/null
@@ -1,11 +0,0 @@
-{application, emqttd,
- [
-  {description, "Erlang MQTT Broker"},
-  {vsn, "2.0"},
-  {id, "emqttd"},
-  {modules, []},
-  {registered, []},
-  {applications, [kernel, stdlib, gproc, esockd, mochiweb, gen_logger]},
-  {mod, {emqttd_app, []}},
-  {env, []}
- ]}.