diff --git a/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java b/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
index ffbdb7ac8caed..6c1ed82766611 100644
--- a/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
+++ b/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
@@ -29,6 +29,7 @@
 import org.openqa.grid.internal.listeners.TestSessionListener;
 import org.openqa.grid.internal.listeners.TimeoutListener;
 import org.openqa.grid.internal.utils.HtmlRenderer;
+import org.openqa.grid.web.servlet.beta.WebProxyHtmlRendererBeta;
 import org.openqa.selenium.remote.server.jmx.JMXHelper;
 import org.openqa.selenium.remote.server.jmx.ManagedAttribute;
 import org.openqa.selenium.remote.server.jmx.ManagedService;
@@ -96,7 +97,7 @@ public void beforeCommand(TestSession session, HttpServletRequest request, HttpS
     session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executing ...");
   }
 
-  private final HtmlRenderer renderer = new WebProxyHtmlRenderer(this);
+  private final HtmlRenderer renderer = new WebProxyHtmlRendererBeta(this);
 
   @Override
   public HtmlRenderer getHtmlRender() {
diff --git a/java/server/src/org/openqa/grid/selenium/proxy/WebProxyHtmlRenderer.java b/java/server/src/org/openqa/grid/selenium/proxy/WebProxyHtmlRenderer.java
deleted file mode 100644
index a074a68335334..0000000000000
--- a/java/server/src/org/openqa/grid/selenium/proxy/WebProxyHtmlRenderer.java
+++ /dev/null
@@ -1,101 +0,0 @@
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package org.openqa.grid.selenium.proxy;
-
-import org.openqa.grid.internal.RemoteProxy;
-import org.openqa.grid.internal.TestSession;
-import org.openqa.grid.internal.TestSlot;
-import org.openqa.grid.internal.utils.HtmlRenderer;
-import org.openqa.grid.web.utils.BrowserNameUtils;
-import org.openqa.selenium.remote.CapabilityType;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
-import java.util.Map;
-
-public class WebProxyHtmlRenderer implements HtmlRenderer {
-
-  private RemoteProxy proxy;
-
-  @SuppressWarnings("unused")
-  private WebProxyHtmlRenderer() {
-  }
-
-  public WebProxyHtmlRenderer(RemoteProxy proxy) {
-    this.proxy = proxy;
-  }
-
-  public String renderSummary() {
-    StringBuilder builder = new StringBuilder();
-    builder.append("<fieldset>");
-    builder.append("<legend>").append(proxy.getClass().getSimpleName()).append("</legend>");
-    builder.append("listening on ").append(proxy.getRemoteHost());
-
-    if (((DefaultRemoteProxy) proxy).isDown()) {
-      builder.append("(cannot be reached at the moment)");
-    }
-    builder.append("<br />");
-    if (proxy.getTimeOut() > 0) {
-      int inSec = proxy.getTimeOut() / 1000;
-      builder.append("test session time out after ").append(inSec).append(" sec.<br />");
-    }
-
-    builder.append("Supports up to <b>").append(proxy.getMaxNumberOfConcurrentTestSessions())
-        .append("</b> concurrent tests from: <br />");
-
-    builder.append("");
-    for (TestSlot slot : proxy.getTestSlots()) {
-      TestSession session = slot.getSession();
-
-      String icon = getIcon(slot.getCapabilities());
-      if (icon != null) {
-        builder.append("<img ");
-        builder.append("src='").append(icon).append("' ");
-      } else {
-        builder.append("<a href='#' ");
-      }
-
-      if (session != null) {
-        builder.append(" class='busy' ");
-        builder.append(" title='").append(session.get("lastCommand")).append("' ");
-      } else {
-        builder.append(" title='")
-        .append(slot.getCapabilities())
-        .append("type="+slot.getProtocol())
-        .append("' ");
-      }
-
-      if (icon != null) {
-        builder.append("/>");
-      } else {
-        builder.append(">");
-        builder.append(slot.getCapabilities().get(CapabilityType.BROWSER_NAME));
-        builder.append("</a>");
-      }
-
-    }
-    builder.append("</fieldset>");
-
-    return builder.toString();
-  }
-
-  private String getIcon(Map<String, Object> capabilities) {
-    return BrowserNameUtils.getConsoleIconPath(new DesiredCapabilities(capabilities),
-        proxy.getRegistry());
-  }
-
-}
diff --git a/java/server/src/org/openqa/grid/web/servlet/beta/ConsoleServlet.java b/java/server/src/org/openqa/grid/web/servlet/beta/ConsoleServlet.java
index d9a19842f59f2..a3dcf18c66783 100644
--- a/java/server/src/org/openqa/grid/web/servlet/beta/ConsoleServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/beta/ConsoleServlet.java
@@ -34,7 +34,6 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -57,13 +56,13 @@ public ConsoleServlet(GridRegistry registry) {
 
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
+      throws IOException {
     process(request, response);
   }
 
   @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
+      throws IOException {
     process(request, response);
   }
 
@@ -122,7 +121,7 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
     // TODO freynaud : registry to return a copy of proxies ?
     List<String> nodes = new ArrayList<>();
     for (RemoteProxy proxy : getRegistry().getAllProxies()) {
-      HtmlRenderer beta = new WebProxyHtmlRendererBeta(proxy);
+      HtmlRenderer beta = proxy.getHtmlRender();
       nodes.add(beta.renderSummary());
     }