diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
index 0314b69b722..1a73c6be729 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
@@ -156,11 +156,6 @@ public class GenericApplicationContext extends AbstractApplicationContext implem
 		this.beanFactory.setParentBeanFactory(getInternalParentBeanFactory());
 	}
 
-	@Override
-	public void setId(String id) {
-		super.setId(id);
-	}
-
 	/**
 	 * Set whether it should be allowed to override bean definitions by registering
 	 * a different definition with the same name, automatically replacing the former.
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index 8766a9b88de..91860229ba0 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -462,16 +462,6 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
 			}
 			return session;
 		}
-
-		@Override
-		public HttpSession getSession() {
-			return super.getSession();
-		}
-
-		@Override
-		public void setSession(HttpSession session) {
-			super.setSession(session);
-		}
 	}
 
 
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index 5e0aa4d362b..575b66f0d95 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -436,28 +436,6 @@ public class MediaType extends MimeType implements Serializable {
 		return (qualityFactory != null ? Double.parseDouble(unquote(qualityFactory)) : 1D);
 	}
 
-	/**
-	 * Indicate whether this {@code MediaType} includes the given media type.
-	 * <p>For instance, {@code text/*} includes {@code text/plain} and {@code text/html}, and {@code application/*+xml}
-	 * includes {@code application/soap+xml}, etc. This method is <b>not</b> symmetric.
-	 * @param other the reference media type with which to compare
-	 * @return {@code true} if this media type includes the given media type; {@code false} otherwise
-	 */
-	public boolean includes(@Nullable MediaType other) {
-		return super.includes(other);
-	}
-
-	/**
-	 * Indicate whether this {@code MediaType} is compatible with the given media type.
-	 * <p>For instance, {@code text/*} is compatible with {@code text/plain}, {@code text/html}, and vice versa.
-	 * In effect, this method is similar to {@link #includes(MediaType)}, except that it <b>is</b> symmetric.
-	 * @param other the reference media type with which to compare
-	 * @return {@code true} if this media type is compatible with the given media type; {@code false} otherwise
-	 */
-	public boolean isCompatibleWith(@Nullable MediaType other) {
-		return super.isCompatibleWith(other);
-	}
-
 	/**
 	 * Return a replica of this instance with the quality value of the given MediaType.
 	 * @return the same instance if the given MediaType doesn't have a quality value, or a new one otherwise
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointRegistration.java
index 01019d37cf4..fbc2bf7f50f 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointRegistration.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointRegistration.java
@@ -201,22 +201,6 @@ public class ServerEndpointRegistration extends ServerEndpointConfig.Configurato
 		super.modifyHandshake(this, request, response);
 	}
 
-	@Override
-	public boolean checkOrigin(String originHeaderValue) {
-		return super.checkOrigin(originHeaderValue);
-	}
-
-	@Override
-	public String getNegotiatedSubprotocol(List<String> supported, List<String> requested) {
-		return super.getNegotiatedSubprotocol(supported, requested);
-	}
-
-	@Override
-	public List<Extension> getNegotiatedExtensions(List<Extension> installed, List<Extension> requested) {
-		return super.getNegotiatedExtensions(installed, requested);
-	}
-
-
 	@Override
 	public String toString() {
 		return "ServerEndpointRegistration for path '" + getPath() + "': " + getEndpointClass();