diff --git a/i2p.cpp b/i2p.cpp
index 3c5f3637..f441fc02 100644
--- a/i2p.cpp
+++ b/i2p.cpp
@@ -1,16 +1,10 @@
-#include <boost/filesystem.hpp>
+#include <thread>
 
-#include "util.h"
 #include "Daemon.h"
 
 int main( int argc, char* argv[] )
 {
-	i2p::util::config::OptionParser(argc, argv);
-
-	LogPrint("\n\n\n\ni2pd starting\n");
-	LogPrint("data directory: ", i2p::util::filesystem::GetDataDir().string());
-	i2p::util::filesystem::ReadConfigFile(i2p::util::config::mapArgs, i2p::util::config::mapMultiArgs);
-
+	Daemon.init(argc, argv);
 	Daemon.start();
 	while (Daemon.running)
 	{
@@ -18,6 +12,5 @@ int main( int argc, char* argv[] )
 		std::this_thread::sleep_for (std::chrono::seconds(1));
 	}
 	Daemon.stop();
-
-	return 0;
+	return EXIT_SUCCESS;
 }