diff --git a/source/common/config/BUILD b/source/common/config/BUILD
index ad2db3c5783a..03e57b8c67e9 100644
--- a/source/common/config/BUILD
+++ b/source/common/config/BUILD
@@ -13,8 +13,6 @@ envoy_cc_library(
     srcs = ["api_type_oracle.cc"],
     hdrs = ["api_type_oracle.h"],
     deps = [
-        "//source/common/common:assert_lib",
-        "//source/common/common:logger_lib",
         "//source/common/protobuf",
         "@com_github_cncf_udpa//udpa/annotations:pkg_cc_proto",
     ],
@@ -354,6 +352,7 @@ envoy_cc_library(
     hdrs = ["version_converter.h"],
     deps = [
         ":api_type_oracle_lib",
+        "//source/common/common:assert_lib",
         "//source/common/protobuf",
         "//source/common/protobuf:well_known_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
diff --git a/source/common/config/api_type_oracle.cc b/source/common/config/api_type_oracle.cc
index 2706c4af2acd..8e89254b7cb8 100644
--- a/source/common/config/api_type_oracle.cc
+++ b/source/common/config/api_type_oracle.cc
@@ -1,8 +1,5 @@
 #include "common/config/api_type_oracle.h"
 
-#include "common/common/assert.h"
-#include "common/common/logger.h"
-
 #include "udpa/annotations/versioning.pb.h"
 
 namespace Envoy {
@@ -20,7 +17,6 @@ ApiTypeOracle::getEarlierVersionDescriptor(const std::string& message_type) {
     const Protobuf::Descriptor* earlier_desc =
         Protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName(
             desc->options().GetExtension(udpa::annotations::versioning).previous_message_type());
-    ASSERT(earlier_desc != nullptr);
     return earlier_desc;
   }