diff --git a/envoy/config/listener/v3/quic_config.proto b/envoy/config/listener/v3/quic_config.proto
index bbfbe71f..42dfa6d1 100644
--- a/envoy/config/listener/v3/quic_config.proto
+++ b/envoy/config/listener/v3/quic_config.proto
@@ -6,7 +6,6 @@ import "envoy/config/core/v3/base.proto";
 import "envoy/config/core/v3/protocol.proto";
 
 import "google/protobuf/duration.proto";
-import "google/protobuf/wrappers.proto";
 
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
diff --git a/envoy/config/listener/v3/udp_listener_config.proto b/envoy/config/listener/v3/udp_listener_config.proto
index 8ef1f834..f59c9e3b 100644
--- a/envoy/config/listener/v3/udp_listener_config.proto
+++ b/envoy/config/listener/v3/udp_listener_config.proto
@@ -5,12 +5,8 @@ package envoy.config.listener.v3;
 import "envoy/config/core/v3/extension.proto";
 import "envoy/config/core/v3/udp_socket_config.proto";
 
-import "google/protobuf/any.proto";
-import "google/protobuf/wrappers.proto";
-
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
-import "validate/validate.proto";
 
 option java_package = "io.envoyproxy.envoy.config.listener.v3";
 option java_outer_classname = "UdpListenerConfigProto";
diff --git a/envoy/config/listener/v4alpha/quic_config.proto b/envoy/config/listener/v4alpha/quic_config.proto
index 10aaf1f1..231e5b30 100644
--- a/envoy/config/listener/v4alpha/quic_config.proto
+++ b/envoy/config/listener/v4alpha/quic_config.proto
@@ -6,7 +6,6 @@ import "envoy/config/core/v4alpha/base.proto";
 import "envoy/config/core/v4alpha/protocol.proto";
 
 import "google/protobuf/duration.proto";
-import "google/protobuf/wrappers.proto";
 
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
diff --git a/envoy/config/listener/v4alpha/udp_listener_config.proto b/envoy/config/listener/v4alpha/udp_listener_config.proto
index 8500c1f6..f6226911 100644
--- a/envoy/config/listener/v4alpha/udp_listener_config.proto
+++ b/envoy/config/listener/v4alpha/udp_listener_config.proto
@@ -5,12 +5,8 @@ package envoy.config.listener.v4alpha;
 import "envoy/config/core/v4alpha/extension.proto";
 import "envoy/config/core/v4alpha/udp_socket_config.proto";
 
-import "google/protobuf/any.proto";
-import "google/protobuf/wrappers.proto";
-
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
-import "validate/validate.proto";
 
 option java_package = "io.envoyproxy.envoy.config.listener.v4alpha";
 option java_outer_classname = "UdpListenerConfigProto";
diff --git a/envoy/extensions/access_loggers/stderror/v3/stderror.proto b/envoy/extensions/access_loggers/stderror/v3/stderror.proto
index 48da8e44..e25401bc 100644
--- a/envoy/extensions/access_loggers/stderror/v3/stderror.proto
+++ b/envoy/extensions/access_loggers/stderror/v3/stderror.proto
@@ -4,10 +4,7 @@ package envoy.extensions.access_loggers.stderror.v3;
 
 import "envoy/config/core/v3/substitution_format_string.proto";
 
-import "google/protobuf/struct.proto";
-
 import "udpa/annotations/status.proto";
-import "udpa/annotations/versioning.proto";
 import "validate/validate.proto";
 
 option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stderror.v3";
diff --git a/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto b/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto
index e14af6ef..3045e8e5 100644
--- a/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto
+++ b/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto
@@ -4,8 +4,6 @@ package envoy.extensions.access_loggers.stderror.v4alpha;
 
 import "envoy/config/core/v4alpha/substitution_format_string.proto";
 
-import "google/protobuf/struct.proto";
-
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
 import "validate/validate.proto";
diff --git a/envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto b/envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto
index e306174d..849218d9 100644
--- a/envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto
+++ b/envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto
@@ -4,10 +4,7 @@ package envoy.extensions.access_loggers.stdoutput.v3;
 
 import "envoy/config/core/v3/substitution_format_string.proto";
 
-import "google/protobuf/struct.proto";
-
 import "udpa/annotations/status.proto";
-import "udpa/annotations/versioning.proto";
 import "validate/validate.proto";
 
 option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stdoutput.v3";
diff --git a/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto b/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto
index 5664025f..4ecc9c58 100644
--- a/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto
+++ b/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto
@@ -4,8 +4,6 @@ package envoy.extensions.access_loggers.stdoutput.v4alpha;
 
 import "envoy/config/core/v4alpha/substitution_format_string.proto";
 
-import "google/protobuf/struct.proto";
-
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
 import "validate/validate.proto";
diff --git a/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.proto b/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.proto
index c154f02c..cb28ea18 100644
--- a/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.proto
+++ b/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.proto
@@ -5,7 +5,6 @@ package envoy.extensions.filters.udp.udp_proxy.v3;
 import "envoy/config/core/v3/udp_socket_config.proto";
 
 import "google/protobuf/duration.proto";
-import "google/protobuf/wrappers.proto";
 
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
diff --git a/envoy/extensions/matching/input_matchers/consistent_hashing/v3/consistent_hashing.proto b/envoy/extensions/matching/input_matchers/consistent_hashing/v3/consistent_hashing.proto
index acf4377f..c44b0b89 100644
--- a/envoy/extensions/matching/input_matchers/consistent_hashing/v3/consistent_hashing.proto
+++ b/envoy/extensions/matching/input_matchers/consistent_hashing/v3/consistent_hashing.proto
@@ -2,9 +2,7 @@ syntax = "proto3";
 
 package envoy.extensions.matching.input_matchers.consistent_hashing.v3;
 
-import "udpa/annotations/migrate.proto";
 import "udpa/annotations/status.proto";
-import "udpa/annotations/versioning.proto";
 import "validate/validate.proto";
 
 option java_package = "io.envoyproxy.envoy.extensions.matching.input_matchers.consistent_hashing.v3";
diff --git a/envoy/type/http/v3/path_transformation.proto b/envoy/type/http/v3/path_transformation.proto
index 6f13b783..8a3c9ef5 100644
--- a/envoy/type/http/v3/path_transformation.proto
+++ b/envoy/type/http/v3/path_transformation.proto
@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.type.http.v3;
 
-import "udpa/annotations/migrate.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";