--- a/src/org/eclipse/jetty/server/Connector.java	Thu Oct 06 23:43:36 2016 -0600
+++ b/src/org/eclipse/jetty/server/Connector.java	Thu Oct 06 23:46:51 2016 -0600
@@ -66,12 +66,6 @@
 	private int _acceptorPriorityOffset = 0;
 	private boolean _useDNS;
 
-	private String _forwardedHostHeader = HttpHeaders.X_FORWARDED_HOST;
-	private String _forwardedServerHeader = HttpHeaders.X_FORWARDED_SERVER;
-	private String _forwardedForHeader = HttpHeaders.X_FORWARDED_FOR;
-	private String _forwardedProtoHeader = HttpHeaders.X_FORWARDED_PROTO;
-	private String _forwardedCipherSuiteHeader;
-	private String _forwardedSslSessionIdHeader;
 	private boolean _reuseAddress = true;
 
 	protected int _maxIdleTime = 200000;
@@ -368,131 +362,6 @@
 		_useDNS = resolve;
 	}
 
-	/* ------------------------------------------------------------ */
-	/*
-	 *
-	 * @see #setForwarded(boolean)
-	 */
-	public String getForwardedHostHeader()
-	{
-		return _forwardedHostHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @param forwardedHostHeader
-	 *            The header name for forwarded hosts (default x-forwarded-host)
-	 * @see #setForwarded(boolean)
-	 */
-	public void setForwardedHostHeader(String forwardedHostHeader)
-	{
-		_forwardedHostHeader = forwardedHostHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @return the header name for forwarded server.
-	 * @see #setForwarded(boolean)
-	 */
-	public String getForwardedServerHeader()
-	{
-		return _forwardedServerHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @param forwardedServerHeader
-	 *            The header name for forwarded server (default x-forwarded-server)
-	 * @see #setForwarded(boolean)
-	 */
-	public void setForwardedServerHeader(String forwardedServerHeader)
-	{
-		_forwardedServerHeader = forwardedServerHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @see #setForwarded(boolean)
-	 */
-	public String getForwardedForHeader()
-	{
-		return _forwardedForHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @param forwardedRemoteAddressHeader
-	 *            The header name for forwarded for (default x-forwarded-for)
-	 * @see #setForwarded(boolean)
-	 */
-	public void setForwardedForHeader(String forwardedRemoteAddressHeader)
-	{
-		_forwardedForHeader = forwardedRemoteAddressHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * Get the forwardedProtoHeader.
-	 *
-	 * @return the forwardedProtoHeader (default X-Forwarded-For)
-	 * @see #setForwarded(boolean)
-	 */
-	public String getForwardedProtoHeader()
-	{
-		return _forwardedProtoHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * Set the forwardedProtoHeader.
-	 *
-	 * @param forwardedProtoHeader
-	 *            the forwardedProtoHeader to set (default X-Forwarded-For)
-	 * @see #setForwarded(boolean)
-	 */
-	public void setForwardedProtoHeader(String forwardedProtoHeader)
-	{
-		_forwardedProtoHeader = forwardedProtoHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @return The header name holding a forwarded cipher suite (default null)
-	 */
-	public String getForwardedCipherSuiteHeader()
-	{
-		return _forwardedCipherSuiteHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @param forwardedCipherSuite
-	 *            The header name holding a forwarded cipher suite (default null)
-	 */
-	public void setForwardedCipherSuiteHeader(String forwardedCipherSuite)
-	{
-		_forwardedCipherSuiteHeader = forwardedCipherSuite;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @return The header name holding a forwarded SSL Session ID (default null)
-	 */
-	public String getForwardedSslSessionIdHeader()
-	{
-		return _forwardedSslSessionIdHeader;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @param forwardedSslSessionId
-	 *            The header name holding a forwarded SSL Session ID (default null)
-	 */
-	public void setForwardedSslSessionIdHeader(String forwardedSslSessionId)
-	{
-		_forwardedSslSessionIdHeader = forwardedSslSessionId;
-	}
-
 	public int getRequestBufferSize()
 	{
 		return _buffers.getRequestBufferSize();