--- a/src/org/eclipse/jetty/server/Server.java	Mon Oct 17 04:44:53 2016 -0600
+++ b/src/org/eclipse/jetty/server/Server.java	Mon Oct 17 04:59:15 2016 -0600
@@ -36,8 +36,6 @@
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.server.nio.BlockingChannelConnector;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.util.Attributes;
-import org.eclipse.jetty.util.AttributesMap;
 import org.eclipse.jetty.util.LazyList;
 import org.eclipse.jetty.util.MultiException;
 import org.eclipse.jetty.util.TypeUtil;
@@ -56,13 +54,12 @@
  *
  *  @org.apache.xbean.XBean  description="Creates an embedded Jetty web server"
  */
-public class Server extends HandlerWrapper implements Attributes
+public final class Server extends HandlerWrapper
 {
 	private static final Logger LOG = LoggerFactory.getLogger(Server.class);
 
 	public static final String version = "8";
 
-	private final AttributesMap _attributes = new AttributesMap();
 	public final ThreadPoolExecutor threadPool = new ThreadPoolExecutor(256, 256, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 	final List<Connector> connectors = new ArrayList<Connector>();
 
@@ -164,52 +161,6 @@
 		threadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
 	}
 
-	/* ------------------------------------------------------------ */
-	/*
-	 * @see org.eclipse.util.AttributesMap#clearAttributes()
-	 */
-	public void clearAttributes()
-	{
-		_attributes.clearAttributes();
-	}
-
-	/* ------------------------------------------------------------ */
-	/*
-	 * @see org.eclipse.util.AttributesMap#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String name)
-	{
-		return _attributes.getAttribute(name);
-	}
-
-	/* ------------------------------------------------------------ */
-	/*
-	 * @see org.eclipse.util.AttributesMap#getAttributeNames()
-	 */
-	public Enumeration getAttributeNames()
-	{
-		return AttributesMap.getAttributeNamesCopy(_attributes);
-	}
-
-	/* ------------------------------------------------------------ */
-	/*
-	 * @see org.eclipse.util.AttributesMap#removeAttribute(java.lang.String)
-	 */
-	public void removeAttribute(String name)
-	{
-		_attributes.removeAttribute(name);
-	}
-
-	/* ------------------------------------------------------------ */
-	/*
-	 * @see org.eclipse.util.AttributesMap#setAttribute(java.lang.String, java.lang.Object)
-	 */
-	public void setAttribute(String name, Object attribute)
-	{
-		_attributes.setAttribute(name, attribute);
-	}
-
-	/* ------------------------------------------------------------ */
 	@Override
 	public String toString()
 	{