diff --git a/platform/built-in-server/src/org/jetbrains/ide/ActivateApplicationHttpService.java b/platform/built-in-server/src/org/jetbrains/ide/ActivateApplicationHttpService.java
deleted file mode 100644
index 27fc0ee28dda..000000000000
--- a/platform/built-in-server/src/org/jetbrains/ide/ActivateApplicationHttpService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.jetbrains.ide;
-
-import com.intellij.openapi.wm.IdeFocusManager;
-import com.intellij.openapi.wm.IdeFrame;
-import com.intellij.ui.AppIcon;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.handler.codec.http.QueryStringDecoder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-import java.awt.*;
-import java.io.IOException;
-
-/**
- * @author Konstantin Bulenkov
- */
-public class ActivateApplicationHttpService extends RestService {
-  @NotNull
-  @Override
-  protected String getServiceName() {
-    return "show";
-  }
-
-  @Override
-  protected boolean isMethodSupported(@NotNull HttpMethod method) {
-    return method == HttpMethod.GET;
-  }
-
-  @Nullable
-  @Override
-  public String execute(@NotNull QueryStringDecoder urlDecoder, @NotNull FullHttpRequest request, @NotNull ChannelHandlerContext context)
-    throws IOException {
-    final IdeFrame frame = IdeFocusManager.findInstance().getLastFocusedFrame();
-    if (frame instanceof Window) {
-      sendOk(request, context);
-      Runnable runnable = new Runnable() {
-        @Override
-        public void run() {
-          Window window = (Window)frame;
-          window.toFront();
-          window.requestFocusInWindow();
-
-          AppIcon.getInstance().requestFocus(frame);
-
-        }
-      };
-      //noinspection SSBasedInspection
-      SwingUtilities.invokeLater(runnable);
-      return "Success";
-    }
-    sendStatus(HttpResponseStatus.NOT_FOUND, false, context.channel());
-    return "Can't find IDE Frame";
-  }
-}
diff --git a/platform/built-in-server/src/org/jetbrains/ide/JetBrainsProtocolHandlerHttpService.java b/platform/built-in-server/src/org/jetbrains/ide/JetBrainsProtocolHandlerHttpService.java
deleted file mode 100644
index b6005cce57eb..000000000000
--- a/platform/built-in-server/src/org/jetbrains/ide/JetBrainsProtocolHandlerHttpService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.jetbrains.ide;
-
-import com.google.gson.stream.JsonReader;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.JBProtocolCommand;
-import com.intellij.openapi.application.JetBrainsProtocolHandler;
-import com.intellij.openapi.application.ModalityState;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.QueryStringDecoder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.IOException;
-
-/**
- * @author Konstantin Bulenkov
- */
-public class JetBrainsProtocolHandlerHttpService extends RestService {
-  private static final String URL_PARAM_NAME = "url";
-
-  @NotNull
-  @Override
-  protected String getServiceName() {
-    return "internal";
-  }
-
-  @Override
-  protected boolean isMethodSupported(@NotNull HttpMethod method) {
-    return method == HttpMethod.POST;
-  }
-
-  @Nullable
-  @Override
-  public String execute(@NotNull QueryStringDecoder urlDecoder, @NotNull FullHttpRequest request, @NotNull ChannelHandlerContext context) throws IOException {
-    final JsonReader reader = createJsonReader(request);
-    reader.beginObject();
-    final String name = reader.nextName();
-    final String url = reader.nextString();
-    reader.endObject();
-
-    activateLastFocusedFrame();
-
-    if (URL_PARAM_NAME.equals(name) && url != null && url.startsWith(JetBrainsProtocolHandler.PROTOCOL)) {
-      JetBrainsProtocolHandler.processJetBrainsLauncherParameters(url);
-      ApplicationManager.getApplication().invokeLater(JBProtocolCommand::handleCurrentCommand, ModalityState.any());
-    }
-
-    sendOk(request, context);
-    return null;
-  }
-}
diff --git a/platform/platform-resources/src/META-INF/built-in-server.xml b/platform/platform-resources/src/META-INF/built-in-server.xml
index 63a623f6086a..b38e318efdef 100644
--- a/platform/platform-resources/src/META-INF/built-in-server.xml
+++ b/platform/platform-resources/src/META-INF/built-in-server.xml
@@ -27,10 +27,8 @@
     <httpRequestHandler implementation="org.jetbrains.ide.XmlRpcServerImpl$XmlRpcRequestHandler"/>
     <httpRequestHandler implementation="org.jetbrains.ide.ProjectSetRequestHandler"/>
     <httpRequestHandler implementation="org.jetbrains.ide.DiffHttpService"/>
-    <httpRequestHandler implementation="org.jetbrains.ide.ActivateApplicationHttpService"/>
     <httpRequestHandler implementation="org.jetbrains.ide.OpenFileHttpService"/>
     <httpRequestHandler implementation="org.jetbrains.ide.AboutHttpService"/>
-    <httpRequestHandler implementation="org.jetbrains.ide.JetBrainsProtocolHandlerHttpService"/>
     <httpRequestHandler implementation="org.jetbrains.builtInWebServer.BuiltInWebServer"/>
   </extensions>
   <extensions defaultExtensionNs="org.jetbrains">