diff --git a/ClientContext.cpp b/ClientContext.cpp
index c9de0b86..95d2d0a1 100644
--- a/ClientContext.cpp
+++ b/ClientContext.cpp
@@ -48,32 +48,7 @@ namespace client
 		m_SocksProxy = new i2p::proxy::SOCKSProxy(i2p::util::config::GetArg("-socksproxyaddress", "127.0.0.1"), i2p::util::config::GetArg("-socksproxyport", 4447), localDestination);
 		m_SocksProxy->Start();
 	
-		// I2P tunnels: IRC
-		std::string ircDestination = i2p::util::config::GetArg("-ircdest", "");
-		if (ircDestination.length () > 0) // ircdest is presented
-		{
-			LogPrint(eLogInfo, "Clients: starting IRC tunnel");
-			localDestination = nullptr;
-			std::string ircKeys = i2p::util::config::GetArg("-irckeys", "");	
-			if (ircKeys.length () > 0)
-				localDestination = LoadLocalDestination (ircKeys, false);
-			auto ircPort = i2p::util::config::GetArg("-ircport", 6668);
-			auto ircTunnel = new I2PClientTunnel (ircDestination, i2p::util::config::GetArg("-ircaddress", "127.0.0.1"), ircPort, localDestination);
-			ircTunnel->Start ();
-			m_ClientTunnels.insert (std::make_pair(ircPort, std::unique_ptr<I2PClientTunnel>(ircTunnel)));
-		}	
-
-		// I2P tunnels: local site
-		std::string eepKeys = i2p::util::config::GetArg("-eepkeys", "");
-		if (eepKeys.length () > 0) // eepkeys file is presented
-		{
-			LogPrint(eLogInfo, "Clients: starting server tunnel for eepsite");
-			localDestination = LoadLocalDestination (eepKeys, true);
-			auto serverTunnel = new I2PServerTunnel (i2p::util::config::GetArg("-eephost", "127.0.0.1"),
- 				i2p::util::config::GetArg("-eepport", 80), localDestination);
-			serverTunnel->Start ();
-			m_ServerTunnels.insert (std::make_pair(localDestination->GetIdentHash (), std::unique_ptr<I2PServerTunnel>(serverTunnel)));
-		}
+		// I2P tunnels
 		ReadTunnels ();
 
 		// SAM
diff --git a/docs/configuration.md b/docs/configuration.md
index 5a420b23..04d68779 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -17,14 +17,6 @@ i2pd cmdline options
 * --socksproxyaddress=  - The address to listen on (SOCKS Proxy)
 * --socksproxyport=     - The port to listen on (SOCKS Proxy). 4447 by default
 * --proxykeys=          - optional keys file for proxy's local destination
-* --ircaddress=         - The address to listen on (IRC tunnel)
-* --ircport=            - The port listen on (IRC tunnel). 6668 by default
-* --ircdest=            - I2P destination address of IRC server. For example irc.postman.i2p
-* --irckeys=            - optional keys file for tunnel's local destination 
-* --eepkeys=            - File name containing destination keys, for example privKeys.dat.
-                          The file will be created if it does not already exist (issue #110).
-* --eephost=            - Address incoming trafic forward to. 127.0.0.1 by default
-* --eepport=            - Port incoming trafic forward to. 80 by default
 * --samaddress=         - The address to listen on (SAM bridge)
 * --samport=            - Port of SAM bridge. Usually 7656. SAM is off if not specified
 * --bobaddress=         - The address to listen on (BOB command channel)