diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 812a94f696..27a67c2332 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -79,163 +79,10 @@ target_include_directories(upb INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
 )
 target_link_libraries(upb INTERFACE
-  base
-  collections_internal
-  mem
-  message_internal
-  mini_table
-  port)
-
-add_library(message INTERFACE
-    
-)
-target_include_directories(message INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message INTERFACE
   base
   mem
-  message_internal
-  mini_table
-  port)
-
-add_library(message_internal 
-    ../upb/message/message.c
-  ../upb/message/internal/extension.h
-  ../upb/message/internal/message.h
-  ../upb/message/message.h
-)
-target_include_directories(message_internal PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_internal
-  base
-  base_internal
-  hash
-  mem
-  mini_table
-  port)
-
-add_library(message_tagged_ptr INTERFACE
-    
-)
-target_include_directories(message_tagged_ptr INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_tagged_ptr INTERFACE
-  message_typedef
   port)
 
-add_library(message_accessors_internal INTERFACE
-    
-)
-target_include_directories(message_accessors_internal INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_accessors_internal INTERFACE
-  collections_internal
-  message_internal
-  mini_table_internal
-  port)
-
-add_library(message_accessors 
-    ../upb/message/accessors.c
-  ../upb/message/internal/accessors.h
-  ../upb/message/accessors.h
-)
-target_include_directories(message_accessors PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_accessors
-  base
-  collections_internal
-  eps_copy_input_stream
-  message_internal
-  mini_table
-  mini_table_internal
-  port
-  upb
-  wire
-  wire_internal
-  wire_reader)
-
-add_library(message_promote 
-    ../upb/message/promote.c
-  ../upb/message/promote.h
-)
-target_include_directories(message_promote PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_promote
-  base
-  collections_internal
-  eps_copy_input_stream
-  hash
-  mem
-  message_accessors
-  message_internal
-  message_typedef
-  mini_table
-  port
-  upb
-  wire
-  wire_internal
-  wire_reader)
-
-add_library(message_copy 
-    ../upb/message/copy.c
-  ../upb/message/copy.h
-)
-target_include_directories(message_copy PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_copy
-  base
-  collections_internal
-  mem
-  message_accessors
-  message_internal
-  message_typedef
-  mini_table
-  mini_table_internal
-  port
-  upb)
-
-add_library(message_split64 INTERFACE
-    
-)
-target_include_directories(message_split64 INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_split64 INTERFACE
-  message_accessors
-  port)
-
-add_library(message_typedef INTERFACE
-    
-)
-target_include_directories(message_typedef INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-
 add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE
     
 )
@@ -286,16 +133,4 @@ target_link_libraries(generated_reflection_support__only_for_generated_code_do_n
   mini_descriptor
   reflection_internal)
 
-add_library(message_rep_internal INTERFACE
-    
-)
-target_include_directories(message_rep_internal INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cmake>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINRARY_DIR}>
-)
-target_link_libraries(message_rep_internal INTERFACE
-  base
-  hash)
-