diff --git a/src/ejabberd.app b/src/ejabberd.app
index 894141e54..a62f43ef1 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -43,7 +43,7 @@
 		ejabberd_mod_roster,
 		ejabberd_listeners
 	       ]},
-  {applications, [kernel, stdlib, mnesia, crypto, ssl]},
+  {applications, [kernel, stdlib, crypto, ssl]},
   {env, []},
   {mod, {ejabberd_app, []}}]}.
 
diff --git a/src/ejabberd.erl b/src/ejabberd.erl
index c34430fc3..6447db959 100644
--- a/src/ejabberd.erl
+++ b/src/ejabberd.erl
@@ -13,7 +13,7 @@
 -export([start/0, stop/0]).
 
 start() ->
-    application:start(mnesia),
+    %application:start(mnesia),
     application:start(crypto),
     application:start(ssl),
     application:start(ejabberd).
@@ -22,60 +22,3 @@ stop() ->
     application:stop(ejabberd).
 
 
-%-include("ejabberd.hrl").
-
-%start() ->
-%    spawn(?MODULE, init, []).
-%
-%init() ->
-%    register(ejabberd, self()),
-%    % Profiling
-%    %eprof:start(),
-%    %eprof:profile([self()]),
-%    %erlang:system_flag(fullsweep_after, 0),
-%    error_logger:logfile({open, ?ERROR_LOG_PATH}),
-%    randoms:start(),
-%    ok = erl_ddll:load_driver(".", expat_erl),
-%    Port = open_port({spawn, expat_erl}, [binary]),
-%    db_init(),
-%    sha:start(),
-%    translate:start(),
-%    acl:start(),
-%    gen_mod:start(),
-%    ejabberd_config:start(),
-%    ejabberd_auth:start(),
-%    ejabberd_router:start(),
-%    ejabberd_sm:start(),
-%    ejabberd_s2s:start(),
-%    ejabberd_local:start(),
-%    ejabberd_listener:start(),
-%    load_modules(),
-%    loop(Port).
-%
-%
-%loop(Port) ->
-%    receive
-%	_ ->
-%	    loop(Port)
-%    end.
-%
-%db_init() ->
-%    case mnesia:system_info(extra_db_nodes) of
-%	[] ->
-%	    mnesia:create_schema([node()]);
-%	_ ->
-%	    ok
-%    end,
-%    mnesia:start(),
-%    mnesia:wait_for_tables(mnesia:system_info(local_tables), infinity).
-%
-%load_modules() ->
-%    case ejabberd_config:get_local_option(modules) of
-%	undefined ->
-%	    ok;
-%	Modules ->
-%	    lists:foreach(fun({Module, Args}) ->
-%				  gen_mod:start_module(Module, Args)
-%			  end, Modules)
-%    end.
-