diff --git a/python/dist/BUILD.bazel b/python/dist/BUILD.bazel
index 34f32452bb..03c44c03d2 100644
--- a/python/dist/BUILD.bazel
+++ b/python/dist/BUILD.bazel
@@ -239,7 +239,6 @@ pkg_files(
         "//python:message_srcs",
         "//upb:source_files",
         "//upb/base:source_files",
-        "//upb/collections:source_files",
         "//upb/hash:source_files",
         "//upb/lex:source_files",
         "//upb/mem:source_files",
diff --git a/upb/BUILD b/upb/BUILD
index 1b0ae3f28a..44476c167c 100644
--- a/upb/BUILD
+++ b/upb/BUILD
@@ -79,20 +79,6 @@ package_group(
     packages = ["//..."],
 )
 
-cc_library(
-    name = "upb",
-    hdrs = [
-        "upb.hpp",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    deprecation = "use upb:base and/or upb:mem instead",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":base",
-        ":mem",
-    ],
-)
-
 # Common support routines used by generated code.  This library has no
 # implementation, but depends on :upb and exposes a few more hdrs.
 #
@@ -137,13 +123,6 @@ alias(
     visibility = ["//visibility:public"],
 )
 
-alias(
-    name = "collections",
-    actual = "//upb/collections",
-    deprecation = "use upb:message instead",
-    visibility = ["//visibility:public"],
-)
-
 alias(
     name = "descriptor_upb_proto",
     actual = "//upb/reflection:descriptor_upb_proto",
@@ -423,7 +402,6 @@ filegroup(
     srcs = glob(
         [
             "**/*.h",
-            "**/*.hpp",
         ],
         exclude = [
             "**/conformance_upb.c",
diff --git a/upb/cmake/BUILD.bazel b/upb/cmake/BUILD.bazel
index 373f33fb66..d79ede3a31 100644
--- a/upb/cmake/BUILD.bazel
+++ b/upb/cmake/BUILD.bazel
@@ -89,7 +89,6 @@ sh_test(
         "//third_party/utf8_range:utf8_range_srcs",
         "//upb:source_files",
         "//upb/base:source_files",
-        "//upb/collections:source_files",
         "//upb/hash:source_files",
         "//upb/lex:source_files",
         "//upb/mem:source_files",
diff --git a/upb/collections/BUILD b/upb/collections/BUILD
deleted file mode 100644
index d22268441d..0000000000
--- a/upb/collections/BUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
-
-load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
-
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
-
-cc_library(
-    name = "collections",
-    hdrs = [
-        "array.h",
-        "map.h",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//upb:message",
-    ],
-)
-
-# begin:github_only
-filegroup(
-    name = "source_files",
-    srcs = glob(
-        [
-            "**/*.h",
-        ],
-    ),
-    visibility = [
-        "//python/dist:__pkg__",
-        "//upb/cmake:__pkg__",
-    ],
-)
-# end:github_only
diff --git a/upb/collections/array.h b/upb/collections/array.h
deleted file mode 100644
index 187e74eeab..0000000000
--- a/upb/collections/array.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2023 Google LLC.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-// Temporary hack to fix gRPC. Do not use.
-
-#ifndef UPB_COLLECTIONS_ARRAY_H_
-#define UPB_COLLECTIONS_ARRAY_H_
-
-// IWYU pragma: begin_exports
-#include "upb/message/array.h"
-// IWYU pragma: end_exports
-
-#endif /* UPB_COLLECTIONS_ARRAY_H_ */
diff --git a/upb/collections/map.h b/upb/collections/map.h
deleted file mode 100644
index 0729cb3ec3..0000000000
--- a/upb/collections/map.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2023 Google LLC.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-// Temporary hack to fix gRPC. Do not use.
-
-#ifndef UPB_COLLECTIONS_MAP_H_
-#define UPB_COLLECTIONS_MAP_H_
-
-// IWYU pragma: begin_exports
-#include "upb/message/map.h"
-// IWYU pragma: end_exports
-
-#endif /* UPB_COLLECTIONS_MAP_H_ */
diff --git a/upb/upb.hpp b/upb/upb.hpp
deleted file mode 100644
index 9276c16b55..0000000000
--- a/upb/upb.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2023 Google LLC.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-// Temporary hack to fix gRPC. Do not use.
-
-#ifndef UPB_HPP_
-#define UPB_HPP_
-
-// IWYU pragma: begin_exports
-#include "upb/base/status.hpp"
-#include "upb/mem/arena.hpp"
-// IWYU pragma: end_exports
-
-#endif  // UPB_HPP_