--- a/src/org/eclipse/jetty/server/Server.java	Mon Sep 19 16:11:15 2016 -0600
+++ b/src/org/eclipse/jetty/server/Server.java	Mon Sep 19 16:38:36 2016 -0600
@@ -36,7 +36,6 @@
 import org.eclipse.jetty.util.MultiException;
 import org.eclipse.jetty.util.TypeUtil;
 import org.eclipse.jetty.util.URIUtil;
-import org.eclipse.jetty.util.component.Container;
 import org.eclipse.jetty.util.component.Destroyable;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.slf4j.Logger;
@@ -69,7 +68,6 @@
 			__version=System.getProperty("jetty.version","8.y.z-SNAPSHOT");
 	}
 
-	private final Container _container=new Container();
 	private final AttributesMap _attributes = new AttributesMap();
 	private ThreadPool _threadPool;
 	private Connector[] _connectors;
@@ -123,15 +121,6 @@
 	}
 
 	/* ------------------------------------------------------------ */
-	/**
-	 * @return Returns the container.
-	 */
-	public Container getContainer()
-	{
-		return _container;
-	}
-
-	/* ------------------------------------------------------------ */
 	public boolean getStopAtShutdown()
 	{
 		return _stopAtShutdown;
@@ -195,7 +184,6 @@
 				connectors[i].setServer(this);
 		}
 
-		_container.update(this, _connectors, connectors, "connector");
 		_connectors = connectors;
 	}
 
@@ -216,7 +204,6 @@
 	{
 		if (_threadPool!=null)
 			removeBean(_threadPool);
-		_container.update(this, _threadPool, threadPool, "threadpool",false);
 		_threadPool = threadPool;
 		if (_threadPool!=null)
 			addBean(_threadPool);
@@ -489,7 +476,6 @@
 	{
 		if (super.addBean(o))
 		{
-			_container.addBean(o);
 			return true;
 		}
 		return false;
@@ -515,7 +501,6 @@
 	{
 		if (super.removeBean(o))
 		{
-			_container.removeBean(o);
 			return true;
 		}
 		return false;