diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml
index 65b31a10b6d9..e1ab36a3ff90 100644
--- a/.idea/libraries/Netty.xml
+++ b/.idea/libraries/Netty.xml
@@ -4,11 +4,11 @@
       <root url="file://$PROJECT_DIR$/lib/annotations/netty"/>
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.4.Final.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.5.Final.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.4.Final-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.5.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/lib/netty-all-4.1.4.Final.jar b/lib/netty-all-4.1.5.Final.jar
similarity index 73%
rename from lib/netty-all-4.1.4.Final.jar
rename to lib/netty-all-4.1.5.Final.jar
index 4722a17b955d..33534cab0ccf 100644
Binary files a/lib/netty-all-4.1.4.Final.jar and b/lib/netty-all-4.1.5.Final.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 255f3e1f020a..896d1433769b 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -51,7 +51,7 @@ miglayout-core-5.0.jar
 miglayout-swing-5.0.jar
 nanoxml-2.2.3.jar
 nekohtml-1.9.14.jar
-netty-all-4.1.4.Final.jar
+netty-all-4.1.5.Final.jar
 oromatcher.jar
 picocontainer.jar
 protobuf-2.5.0.jar
diff --git a/lib/src/netty-all-4.1.4.Final-sources.jar b/lib/src/netty-all-4.1.5.Final-sources.jar
similarity index 77%
rename from lib/src/netty-all-4.1.4.Final-sources.jar
rename to lib/src/netty-all-4.1.5.Final-sources.jar
index ceed0c9faeeb..9a61b1977832 100644
Binary files a/lib/src/netty-all-4.1.4.Final-sources.jar and b/lib/src/netty-all-4.1.5.Final-sources.jar differ
diff --git a/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java b/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java
index a080eb512141..6030acfc5e50 100644
--- a/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java
+++ b/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java
@@ -14,7 +14,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Url;
 import com.intellij.util.UrlImpl;
 import com.intellij.util.net.NetUtils;
-import io.netty.channel.EventLoopGroup;
 import io.netty.channel.oio.OioEventLoopGroup;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -124,13 +123,6 @@ public class BuiltInServerManagerImpl extends BuiltInServerManager {
     return server;
   }
 
-  @NotNull
-  public EventLoopGroup getEventLoopGroup() {
-    waitForStart();
-    assert server != null;
-    return server.getEventLoopGroup();
-  }
-
   @Override
   public boolean isOnBuiltInWebServer(@Nullable Url url) {
     return url != null && !StringUtil.isEmpty(url.getAuthority()) && isOnBuiltInWebServerByAuthority(url.getAuthority());