diff --git a/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz
index 2ca3928c9c0ab..32c5a9a109bef 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz
index 412f6ba563e3e..587e02f1f747e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_accesscontextmanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz
index ccf558461452b..ea4d3311e48e3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_advisorynotifications.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz
index d05445b65174a..15f05990f59c8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_aiplatform.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz
index 7848d11cd5936..6e686faf61c6a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz
index 89290a3591023..3d629f5f3fb1d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz
index 849accb6b9905..5bb697debd157 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz
index fb91ffc89c275..a570440011040 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz
index 1c7f152673a2a..2455a33fa7b53 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz
index 0f43dbad71a63..1ac54be70f6ac 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_apphub.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz
index cbbb74767d90c..10fd37a133faa 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_artifactregistry.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz
index e53b697cbedef..61cd02102d4aa 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz
index fe4d3fc94c9a1..ffd92aec20c96 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_assuredworkloads.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz
index 9b5ca2e8442a5..bddd05679fc5f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz
index 763e3ec4dff40..26e8b11147c91 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_backupdr.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz
index 6bcb56ba28fd1..38a1b9187cd1c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_baremetalsolution.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz
index 1513b7b3bfb18..87c6f69871dd2 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz
index f6d10845a1344..51b118b64f30d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz
index 1eb4b66b115fb..4a6ee150db513 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz
index adc2002a804f3..3cba15d92f539 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_bigquerycontrol.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz
index 8d88780f3833f..b5f9de316e286 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz
index c0e982d4e5205..bb9bfddaa8a92 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz
index 561bf52b5c72c..2a94f8bdd32dd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_binaryauthorization.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz
index f5b843a85a74b..61e42c3c7117c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_certificatemanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz
index ad916ffce55ff..678e67899f50a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz
index 9c612357e4b04..b1bc8d0a1e325 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_chronicle.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz
index 572971536cb3e..3f58812f5ecc3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz
index 34b0018da852e..b8f5fe7bafb15 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudcontrolspartner.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz
index f247d3515eb0e..3a0ad34824bc4 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudquotas.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz
index 3889fdd432360..e859ef9efdc76 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_cloudsecuritycompliance.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz
index 0ceb4f1c700e6..ce5e0eb8959f0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_commerce.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz
index 8ef777eadcf44..042f4dba8b836 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz
index 46ba24e3d09ab..24e3bc0785df9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz
index 1e0685b0b6811..506d2ee2612d3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_accelerator_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz
index 40703b88c3293..a3a3a963ccaff 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_addresses.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz
index ff61ed228f99f..7658f47779eb2 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_autoscalers.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz
index fe665dd2c5a0a..a747cc2328c9a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_backend_buckets.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz
index f16d8c9fd3cf7..c2184cefddd60 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_backend_services.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz
index 50cbdbf67a953..eee6e113e75d8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_disk_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz
index 9e7cd1fcbaddb..2e551868771a7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_disks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz
index 113d7d2e70de1..ca25298ae870a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_external_vpn_gateways.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz
index 15c31521f5707..18be02df70d11 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_firewall_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz
index c575454db6a5b..5373bacb2fde3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_firewalls.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz
index 1d6cc6a75590e..eddad94bfb96a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_forwarding_rules.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz
index 3b915055b3ccd..7b3049c52adfd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_addresses.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz
index b7ebb05f07723..f407c38697fcf 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_forwarding_rules.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz
index 123abef845c70..635b0162b010e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_network_endpoint_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz
index 4dd27167a20bd..30c3e89f486bb 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_operations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz
index 36f94f8ece84a..60619334f382c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_organization_operations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz
index beca8b11fe0d8..77716c683ce9a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_global_public_delegated_prefixes.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz
index bd59123bb1d8d..0d2335e930dd6 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_health_checks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz
index 7038c87d82379..9f8e630ab5c92 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_http_health_checks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz
index fd723d583eaaf..39f4769706a00 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_https_health_checks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz
index 3b69c4604d405..211f88ce5d689 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_image_family_views.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz
index 144802a788b7b..38d0ada33dc77 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_images.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz
index b3dec228d9a08..6b697c817d34a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instance_group_managers.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz
index cb6acd549e241..0800a3a290058 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instance_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz
index 0921396bf3c05..0e61f92066844 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instance_templates.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz
index d3730246f10e2..3d82c78ad9752 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_instances.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz
index 80873d5ed032e..bc1293941c630 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_attachments.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz
index 7cced851fbea1..a85aa77032972 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_interconnect_locations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz
index 58f9c87287563..5d514b5c26ac4 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_interconnects.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz
index 2516310f36311..4f146947272ce 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_license_codes.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz
index 1f3b2b8180d88..c1712dda84717 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_licenses.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz
index 7143c3dd36535..7bb9f2b274f57 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_machine_images.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz
index d5533ff1c7418..03fb4a062e5f9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_machine_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz
index 28f5ea7e4f97a..63cb980ddd2c2 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_attachments.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz
index 66633c13a406b..8ff36b5d60520 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_edge_security_services.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz
index 515914b9194e9..5983cfd93c696 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_endpoint_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz
index bf073ca79b465..8d6ef062ff694 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_network_firewall_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz
index 7207bdf8b522b..8162a09d66096 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_networks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz
index 691af80fd9e7c..1f16a1a124888 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_node_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz
index 5d4d67c1c95a2..65f9e78ef0464 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_node_templates.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz
index a28ed25f6f9a3..582eb42b83597 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_node_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz
index 2ac5d81e0ea82..b85184adaf73e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_packet_mirrorings.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz
index fc0d754c3b724..732559b616427 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_projects.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz
index 3da7ed3465c3a..b6b51ad9e7838 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_public_advertised_prefixes.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz
index 941738e463799..9f621bd089f45 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_public_delegated_prefixes.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz
index c284c45cc5fda..4c231efc118be 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_autoscalers.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz
index 4840e68120148..999956c2a1dda 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_backend_services.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz
index c09d86d154aed..82369c3c06a9d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_commitments.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz
index 56d4a004de846..f97be0b019068 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_disk_types.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz
index 7b4377ed05005..f601edf6ed520 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_disks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz
index 66c5403e6aab7..589242a8a25de 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_health_check_services.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz
index 13ea21cdfde36..c786cf140f494 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_health_checks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz
index bfc2738dfb854..11076ec8aeb08 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_group_managers.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz
index d17d3f254ecca..4456a912250aa 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz
index dbf836df7fcf4..2a713c67fe1bc 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instance_templates.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz
index 32b9694fa92d7..2d85dd270eb3e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_instances.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz
index 458530ac06000..2832dd16012b9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_network_endpoint_groups.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz
index 645d8ca6eb589..4d039333933da 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_network_firewall_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz
index 27c57ef36837c..333efd16e3be7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_notification_endpoints.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz
index cf836637ce6ad..7b432c154af74 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_operations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz
index 2a1171abae69d..400a2a8fd9c1a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_security_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz
index eef8ac73e54b6..649ccc01ef5a0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_region_ssl_certificates.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz
index eea36f632d25c..1a81ed0346304 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_ssl_policies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz
index 1c8a6c1362f0f..a69c6a082a0a9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_subnetworks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz
index 75939ff173b45..97465cbf5baeb 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_grpc_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz
index 0d45022f0ec8a..c506622a74aa8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_http_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz
index d1cf6bb5a1ada..8148541dea534 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_https_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz
index 1a4e36b45b2c5..52447d15ece97 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_instances.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz
index f7543e27ad242..ad4217c9528fd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_pools.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz
index b076ce83a6945..d4eb1cdc418ae 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_ssl_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz
index a1334956abe08..825f5d389caa3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_tcp_proxies.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz
index edf6ad2351b39..e73180a01b530 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_target_vpn_gateways.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz
index 0bb915814e8a0..1362647404502 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_url_maps.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz
index a931350800cfd..d79528f6546ea 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_vpn_gateways.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz
index 9a66f91fb194d..5e4f3b8477bba 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_vpn_tunnels.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz
index 995980119d0b4..2d00ad4700ced 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_zone_operations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz
index 944cec1d52454..058a2c87a203f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_compute_zones.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz
index b7866eb88b1ec..2e120ec2f3f24 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_confidentialcomputing.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz
index 93b685948e6d3..0af471b21d75c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_config.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz
index df546812bcc83..3e9f5047bec3e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_configdelivery.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz
index fce285e1e8de4..2fdb8ebc7c7f5 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz
index cfe2e78702824..4619f1638b2e2 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_contactcenterinsights.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz
index 306c0be874dc1..0e22da979b547 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz
index efbbf9972e804..27e5ecf79bd1a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_containeranalysis.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz
index 3bae3b45db9b1..c264f7a5cd929 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_contentwarehouse.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz
index d5e26cdf652c3..d82f35272860f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datacatalog.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz
index 2fcdb41006d06..60a9695752dd6 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dataform.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz
index 98e13fea6252c..50341ebeeddf3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datafusion.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz
index e5b349e031384..9dc44136fd01e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datamigration.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz
index 6bf4fb44951c6..be80065adf6dc 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz
index 549e5ae653515..f72e863a0e9cc 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz
index 6b33e30e95153..8e3a40a24bd8f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datastore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz
index 5a731e90e4555..86d487e3ad927 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz
index 95c710eae3749..d448295622a04 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz
index 725c041015933..ac242c6065ecd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_developerconnect.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz
index ce9a3473647fb..cd7b600c6eb5d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_devicestreaming.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz
index a6366d4b68760..e704f1c11a570 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dialogflow_cx.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz
index 4c4b5cb8615ae..074c7b0d61edf 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dialogflow_es.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz
index b1dc7fc8c7405..ba85de9329b6b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_discoveryengine.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz
index 53af7664b5587..e42a860e7cf4f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz
index 2c23e06004ee8..4cd9c2b847822 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz
index 72cf7ad27beae..945efc95dd759 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_domains.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz
index 82aa8e152ee1b..3fa0c9115ec65 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_edgecontainer.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz
index b4eb41564cf8e..f274999f2beb0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_edgenetwork.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz
index f1708dd07dbcc..dcce5857ad9be 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_essentialcontacts.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz
index 2a84206313ca1..d9de4971015c7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz
index 233533903435c..b91cf5e5ba84c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz
index d48446c4fa218..7276da18fbc88 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_financialservices.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz
index 2186cba777000..d9beed4f9582e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz
index 595fcec13f506..e16d2cac162fb 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkebackup.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz
index 152c82c24c3b4..09495da139271 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkeconnect.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz
index 6d102cee09a3d..d513b03a26e00 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz
index 2765beae2042d..d1d004cd8058a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_gkemulticloud.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz
index 1216f783da694..72c85b5b29b94 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz
index fd70586862cc9..c40da4483ee59 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz
index a447aad26814e..6e0c50e35d1f9 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz
index 4ffef9ded93fe..ba20782539651 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz
index 49a0677900623..3281739319d06 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz
index e86cda84b4093..a0f32a1681c71 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz
index 0007d2941827d..cbf1dd2c29192 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_licensemanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz
index a663c4d726a48..98aaf5290f261 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz
index 941d26119d305..6dd9fe26b961c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_lustre.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz
index 18c6362d2208e..6a0afe7f2d466 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_maintenance.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz
index 6fe6cfc96d2a5..e667b08989fe6 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_managedidentities.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz
index a76972fe16613..c2295a297b0fd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_managedkafka.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz
index 75ec7df6f9372..77adc68624ae8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz
index 2d6dff5090c6e..e83cb254a9e17 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_memorystore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz
index b54a31673ed08..dd7026ecfc262 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_metastore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz
index ad9a9bb79a794..605a157251578 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_migrationcenter.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz
index 940f10d49e980..03923008770a2 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz
index 52d8fa64a2896..8011c10423e89 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_netapp.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz
index 57eef98c6ca7d..93560652e2008 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networkconnectivity.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz
index ccca680f5b19a..391d31f503bfb 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networkmanagement.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz
index 735bb61d76b94..5794a7b620751 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networksecurity.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz
index 74816c8ee3ef9..a2de8fc20a382 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_networkservices.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz
index 8bcac14c68700..8cf2c9812cdd0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz
index 6388a2cc74176..20060b5de0478 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_oauth2.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz
index 326d41d8199aa..7ff2698890c44 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz
index 246c7a9b781a2..495b448c7df52 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz
index 64c9635be06a3..0a9c640d4c29c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_oracledatabase.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz
index 0bf1355469662..f0f527ca0f939 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz
index 6e910cf6f0201..e03570155658e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz
index 4a4146ccd3987..28714f3972f95 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz
index 5468bdedc2d57..8f65c8fc340d6 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_parallelstore.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz
index a0ffd9d7b6e2d..004ed190e411d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_parametermanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz
index 75702d399c883..3603f1eb44f3d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_policysimulator.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz
index 238b7c05548ae..1ce73bba0e6cf 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_policytroubleshooter.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz
index b024fd2308251..7ef9bb06a6abf 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz
index b8e2db6e262bf..081f8f391e675 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_privilegedaccessmanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz
index 5173f4af92ac4..65d4bab11a115 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz
index 22e5f6e28d91f..9f170395487bf 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_publicca.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz
index 82fe7d424aad3..a78f7d21f8670 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz
index 6ab4cd9cb2fce..db7c1dd2e60c3 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_rapidmigrationassessment.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz
index 132b4f6677f98..32d6170bdc36c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_recaptchaenterprise.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz
index 10934a09ee873..77dfb3c37144a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz
index 3fad383c3fdea..8242c5d545eb2 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz
index 40dca528f64c1..4c61d6ec44f0e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_resourcemanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz
index a39e8d68b4ce6..dd38a6e9b3516 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz
index 49597479ae7a0..4cbb04f5c045f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz
index 8db4db4c1947a..916b8dffedaee 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz
index 2dc7e9fd49cbe..94dc01592da66 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz
index b0db2e9eb332e..551e22b9a0b8d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_securesourcemanager.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz
index ca737fe6f67ef..f7bf097abd825 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz
index 83b9651b017ae..5902e55f40452 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_securitycentermanagement.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz
index 4f0ee18b31eb9..1420a031bfc4d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz
index 1063f3fbf906e..36a2259319456 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicedirectory.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz
index 4b08ec5f7acf6..343f32d1a3552 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicehealth.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz
index 6e10837a26e4b..fdbf2ab48927f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_servicemanagement.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz
index e109b6eac7ac4..c2fadf5f039cf 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz
index 4d506e0668d0e..27726fa5eeef0 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz
index a4bc5dfbe4a87..13c4cec7cf7df 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz
index 7f5001b032e0c..bf7cbf03c7b61 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz
index 5332776c6f1bf..c272f4367c509 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_sql.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz
index f2956872ea385..15f82f4e3545a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz
index f9dc41017809b..9648f99b7ee95 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz
index b9dc104ab551b..d5bfd78dcdb6c 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storagebatchoperations.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz
index 45ab351fb3f64..e1ec5624fa54b 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storagecontrol.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz
index 976f85b414df2..2f8f3fff03c2a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storageinsights.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz
index af1739acd9ab1..4d9e6d84b4a5f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_storagetransfer.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz
index 85f6c068ec8d1..cfe4ec31b224e 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_support.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz
index 0d236ded47083..3d2457b6127a7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz
index 37886a15713ca..4da2ea013f27f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz
index a89c404d4c94e..37a18c0545fd6 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_telcoautomation.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz
index c95ca265a131e..26895f7b5bcd8 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz
index e02ebf68e0142..13385aa99db6f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_timeseriesinsights.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz
index 5869f636ab258..a577cd3865763 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz
index 88dd1b443480c..ee00abae03e0f 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz
index 0e8c3a318554b..0b4e82a4fe4fd 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz
index 869ad4039c097..a7f781a201f8a 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_universe_domain.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz
index 3422632363a6d..78b28b0320092 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz
index e794f1650e467..12db5fa42b16d 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_videointelligence.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz
index e1c6b6f613ca5..3206cd22fa4f4 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz
index 5baf593a45352..b39e0e22b0dca 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz
index 1556e1a6d2795..1cbee5e0549e7 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vmwareengine.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz
index ea6f8bd1eb17d..fb091d7fad948 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz
index d7bb993492b6f..b40037c072d53 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz
index 2934fbefe9973..4e5a84293c905 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_websecurityscanner.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz
index db23060840fbf..2b730fe81f9c1 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz differ
diff --git a/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz
index d5eb38ab5123b..c3b7c10652e84 100644
Binary files a/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz and b/ci/abi-dumps/google_cloud_cpp_workstations.expected.abi.dump.gz differ
diff --git a/ci/etc/expected_install_directories b/ci/etc/expected_install_directories
index 7fa97fa28ce97..e852e127c5af7 100644
--- a/ci/etc/expected_install_directories
+++ b/ci/etc/expected_install_directories
@@ -21,12 +21,10 @@
 ./include/google/bigtable/v2
 ./include/google/cloud
 ./include/google/cloud/accessapproval
-./include/google/cloud/accessapproval/mocks
 ./include/google/cloud/accessapproval/v1
 ./include/google/cloud/accessapproval/v1/internal
 ./include/google/cloud/accessapproval/v1/mocks
 ./include/google/cloud/accesscontextmanager
-./include/google/cloud/accesscontextmanager/mocks
 ./include/google/cloud/accesscontextmanager/v1
 ./include/google/cloud/accesscontextmanager/v1/internal
 ./include/google/cloud/accesscontextmanager/v1/mocks
@@ -43,22 +41,18 @@
 ./include/google/cloud/alloydb/v1/internal
 ./include/google/cloud/alloydb/v1/mocks
 ./include/google/cloud/apigateway
-./include/google/cloud/apigateway/mocks
 ./include/google/cloud/apigateway/v1
 ./include/google/cloud/apigateway/v1/internal
 ./include/google/cloud/apigateway/v1/mocks
 ./include/google/cloud/apigeeconnect
-./include/google/cloud/apigeeconnect/mocks
 ./include/google/cloud/apigeeconnect/v1
 ./include/google/cloud/apigeeconnect/v1/internal
 ./include/google/cloud/apigeeconnect/v1/mocks
 ./include/google/cloud/apikeys
-./include/google/cloud/apikeys/mocks
 ./include/google/cloud/apikeys/v2
 ./include/google/cloud/apikeys/v2/internal
 ./include/google/cloud/apikeys/v2/mocks
 ./include/google/cloud/appengine
-./include/google/cloud/appengine/mocks
 ./include/google/cloud/appengine/v1
 ./include/google/cloud/appengine/v1/internal
 ./include/google/cloud/appengine/v1/mocks
@@ -67,22 +61,18 @@
 ./include/google/cloud/apphub/v1/internal
 ./include/google/cloud/apphub/v1/mocks
 ./include/google/cloud/artifactregistry
-./include/google/cloud/artifactregistry/mocks
 ./include/google/cloud/artifactregistry/v1
 ./include/google/cloud/artifactregistry/v1/internal
 ./include/google/cloud/artifactregistry/v1/mocks
 ./include/google/cloud/asset
-./include/google/cloud/asset/mocks
 ./include/google/cloud/asset/v1
 ./include/google/cloud/asset/v1/internal
 ./include/google/cloud/asset/v1/mocks
 ./include/google/cloud/assuredworkloads
-./include/google/cloud/assuredworkloads/mocks
 ./include/google/cloud/assuredworkloads/v1
 ./include/google/cloud/assuredworkloads/v1/internal
 ./include/google/cloud/assuredworkloads/v1/mocks
 ./include/google/cloud/automl
-./include/google/cloud/automl/mocks
 ./include/google/cloud/automl/v1
 ./include/google/cloud/automl/v1/internal
 ./include/google/cloud/automl/v1/mocks
@@ -91,12 +81,10 @@
 ./include/google/cloud/backupdr/v1/internal
 ./include/google/cloud/backupdr/v1/mocks
 ./include/google/cloud/baremetalsolution
-./include/google/cloud/baremetalsolution/mocks
 ./include/google/cloud/baremetalsolution/v2
 ./include/google/cloud/baremetalsolution/v2/internal
 ./include/google/cloud/baremetalsolution/v2/mocks
 ./include/google/cloud/batch
-./include/google/cloud/batch/mocks
 ./include/google/cloud/batch/v1
 ./include/google/cloud/batch/v1/internal
 ./include/google/cloud/batch/v1/mocks
@@ -113,7 +101,6 @@
 ./include/google/cloud/beyondcorp/appgateways/v1
 ./include/google/cloud/beyondcorp/appgateways/v1/internal
 ./include/google/cloud/beyondcorp/appgateways/v1/mocks
-./include/google/cloud/beyondcorp/mocks
 ./include/google/cloud/bigquery
 ./include/google/cloud/bigquery/analyticshub
 ./include/google/cloud/bigquery/analyticshub/v1
@@ -142,7 +129,6 @@
 ./include/google/cloud/bigquery/migration/v2
 ./include/google/cloud/bigquery/migration/v2/internal
 ./include/google/cloud/bigquery/migration/v2/mocks
-./include/google/cloud/bigquery/mocks
 ./include/google/cloud/bigquery/reservation
 ./include/google/cloud/bigquery/reservation/v1
 ./include/google/cloud/bigquery/reservation/v1/internal
@@ -166,22 +152,18 @@
 ./include/google/cloud/billing/budgets/v1
 ./include/google/cloud/billing/budgets/v1/internal
 ./include/google/cloud/billing/budgets/v1/mocks
-./include/google/cloud/billing/mocks
 ./include/google/cloud/billing/v1
 ./include/google/cloud/billing/v1/internal
 ./include/google/cloud/billing/v1/mocks
 ./include/google/cloud/binaryauthorization
-./include/google/cloud/binaryauthorization/mocks
 ./include/google/cloud/binaryauthorization/v1
 ./include/google/cloud/binaryauthorization/v1/internal
 ./include/google/cloud/binaryauthorization/v1/mocks
 ./include/google/cloud/certificatemanager
-./include/google/cloud/certificatemanager/mocks
 ./include/google/cloud/certificatemanager/v1
 ./include/google/cloud/certificatemanager/v1/internal
 ./include/google/cloud/certificatemanager/v1/mocks
 ./include/google/cloud/channel
-./include/google/cloud/channel/mocks
 ./include/google/cloud/channel/v1
 ./include/google/cloud/channel/v1/internal
 ./include/google/cloud/channel/v1/mocks
@@ -190,7 +172,6 @@
 ./include/google/cloud/chronicle/v1/internal
 ./include/google/cloud/chronicle/v1/mocks
 ./include/google/cloud/cloudbuild
-./include/google/cloud/cloudbuild/mocks
 ./include/google/cloud/cloudbuild/v1
 ./include/google/cloud/cloudbuild/v1/internal
 ./include/google/cloud/cloudbuild/v1/mocks
@@ -218,7 +199,6 @@
 ./include/google/cloud/commerce/consumer/procurement/v1/internal
 ./include/google/cloud/commerce/consumer/procurement/v1/mocks
 ./include/google/cloud/composer
-./include/google/cloud/composer/mocks
 ./include/google/cloud/composer/v1
 ./include/google/cloud/composer/v1/internal
 ./include/google/cloud/composer/v1/mocks
@@ -656,22 +636,18 @@
 ./include/google/cloud/configdelivery/v1/internal
 ./include/google/cloud/configdelivery/v1/mocks
 ./include/google/cloud/connectors
-./include/google/cloud/connectors/mocks
 ./include/google/cloud/connectors/v1
 ./include/google/cloud/connectors/v1/internal
 ./include/google/cloud/connectors/v1/mocks
 ./include/google/cloud/contactcenterinsights
-./include/google/cloud/contactcenterinsights/mocks
 ./include/google/cloud/contactcenterinsights/v1
 ./include/google/cloud/contactcenterinsights/v1/internal
 ./include/google/cloud/contactcenterinsights/v1/mocks
 ./include/google/cloud/container
-./include/google/cloud/container/mocks
 ./include/google/cloud/container/v1
 ./include/google/cloud/container/v1/internal
 ./include/google/cloud/container/v1/mocks
 ./include/google/cloud/containeranalysis
-./include/google/cloud/containeranalysis/mocks
 ./include/google/cloud/containeranalysis/v1
 ./include/google/cloud/containeranalysis/v1/internal
 ./include/google/cloud/containeranalysis/v1/mocks
@@ -684,7 +660,6 @@
 ./include/google/cloud/datacatalog/lineage/v1
 ./include/google/cloud/datacatalog/lineage/v1/internal
 ./include/google/cloud/datacatalog/lineage/v1/mocks
-./include/google/cloud/datacatalog/mocks
 ./include/google/cloud/datacatalog/v1
 ./include/google/cloud/datacatalog/v1/internal
 ./include/google/cloud/datacatalog/v1/mocks
@@ -697,17 +672,14 @@
 ./include/google/cloud/datafusion/v1/internal
 ./include/google/cloud/datafusion/v1/mocks
 ./include/google/cloud/datamigration
-./include/google/cloud/datamigration/mocks
 ./include/google/cloud/datamigration/v1
 ./include/google/cloud/datamigration/v1/internal
 ./include/google/cloud/datamigration/v1/mocks
 ./include/google/cloud/dataplex
-./include/google/cloud/dataplex/mocks
 ./include/google/cloud/dataplex/v1
 ./include/google/cloud/dataplex/v1/internal
 ./include/google/cloud/dataplex/v1/mocks
 ./include/google/cloud/dataproc
-./include/google/cloud/dataproc/mocks
 ./include/google/cloud/dataproc/v1
 ./include/google/cloud/dataproc/v1/internal
 ./include/google/cloud/dataproc/v1/mocks
@@ -720,12 +692,10 @@
 ./include/google/cloud/datastore/v1/internal
 ./include/google/cloud/datastore/v1/mocks
 ./include/google/cloud/datastream
-./include/google/cloud/datastream/mocks
 ./include/google/cloud/datastream/v1
 ./include/google/cloud/datastream/v1/internal
 ./include/google/cloud/datastream/v1/mocks
 ./include/google/cloud/deploy
-./include/google/cloud/deploy/mocks
 ./include/google/cloud/deploy/v1
 ./include/google/cloud/deploy/v1/internal
 ./include/google/cloud/deploy/v1/mocks
@@ -752,12 +722,10 @@
 ./include/google/cloud/discoveryengine/v1/internal
 ./include/google/cloud/discoveryengine/v1/mocks
 ./include/google/cloud/dlp
-./include/google/cloud/dlp/mocks
 ./include/google/cloud/dlp/v2
 ./include/google/cloud/dlp/v2/internal
 ./include/google/cloud/dlp/v2/mocks
 ./include/google/cloud/documentai
-./include/google/cloud/documentai/mocks
 ./include/google/cloud/documentai/v1
 ./include/google/cloud/documentai/v1/internal
 ./include/google/cloud/documentai/v1/mocks
@@ -766,7 +734,6 @@
 ./include/google/cloud/domains/v1/internal
 ./include/google/cloud/domains/v1/mocks
 ./include/google/cloud/edgecontainer
-./include/google/cloud/edgecontainer/mocks
 ./include/google/cloud/edgecontainer/v1
 ./include/google/cloud/edgecontainer/v1/internal
 ./include/google/cloud/edgecontainer/v1/mocks
@@ -779,7 +746,6 @@
 ./include/google/cloud/essentialcontacts/v1/internal
 ./include/google/cloud/essentialcontacts/v1/mocks
 ./include/google/cloud/eventarc
-./include/google/cloud/eventarc/mocks
 ./include/google/cloud/eventarc/publishing
 ./include/google/cloud/eventarc/publishing/v1
 ./include/google/cloud/eventarc/publishing/v1/internal
@@ -788,7 +754,6 @@
 ./include/google/cloud/eventarc/v1/internal
 ./include/google/cloud/eventarc/v1/mocks
 ./include/google/cloud/filestore
-./include/google/cloud/filestore/mocks
 ./include/google/cloud/filestore/v1
 ./include/google/cloud/filestore/v1/internal
 ./include/google/cloud/filestore/v1/mocks
@@ -797,7 +762,6 @@
 ./include/google/cloud/financialservices/v1/internal
 ./include/google/cloud/financialservices/v1/mocks
 ./include/google/cloud/functions
-./include/google/cloud/functions/mocks
 ./include/google/cloud/functions/v1
 ./include/google/cloud/functions/v1/internal
 ./include/google/cloud/functions/v1/mocks
@@ -814,7 +778,6 @@
 ./include/google/cloud/gkeconnect/gateway/v1/internal
 ./include/google/cloud/gkeconnect/gateway/v1/mocks
 ./include/google/cloud/gkehub
-./include/google/cloud/gkehub/mocks
 ./include/google/cloud/gkehub/v1
 ./include/google/cloud/gkehub/v1/internal
 ./include/google/cloud/gkehub/v1/mocks
@@ -831,7 +794,6 @@
 ./include/google/cloud/iam/credentials/v1
 ./include/google/cloud/iam/credentials/v1/internal
 ./include/google/cloud/iam/credentials/v1/mocks
-./include/google/cloud/iam/mocks
 ./include/google/cloud/iam/v1
 ./include/google/cloud/iam/v1/internal
 ./include/google/cloud/iam/v1/mocks
@@ -842,12 +804,10 @@
 ./include/google/cloud/iam/v3/internal
 ./include/google/cloud/iam/v3/mocks
 ./include/google/cloud/iap
-./include/google/cloud/iap/mocks
 ./include/google/cloud/iap/v1
 ./include/google/cloud/iap/v1/internal
 ./include/google/cloud/iap/v1/mocks
 ./include/google/cloud/ids
-./include/google/cloud/ids/mocks
 ./include/google/cloud/ids/v1
 ./include/google/cloud/ids/v1/internal
 ./include/google/cloud/ids/v1/mocks
@@ -856,12 +816,10 @@
 ./include/google/cloud/kms/inventory/v1
 ./include/google/cloud/kms/inventory/v1/internal
 ./include/google/cloud/kms/inventory/v1/mocks
-./include/google/cloud/kms/mocks
 ./include/google/cloud/kms/v1
 ./include/google/cloud/kms/v1/internal
 ./include/google/cloud/kms/v1/mocks
 ./include/google/cloud/language
-./include/google/cloud/language/mocks
 ./include/google/cloud/language/v1
 ./include/google/cloud/language/v1/internal
 ./include/google/cloud/language/v1/mocks
@@ -873,7 +831,6 @@
 ./include/google/cloud/licensemanager/v1/internal
 ./include/google/cloud/licensemanager/v1/mocks
 ./include/google/cloud/logging
-./include/google/cloud/logging/mocks
 ./include/google/cloud/logging/v2
 ./include/google/cloud/logging/v2/internal
 ./include/google/cloud/logging/v2/mocks
@@ -887,7 +844,6 @@
 ./include/google/cloud/maintenance/api/v1/internal
 ./include/google/cloud/maintenance/api/v1/mocks
 ./include/google/cloud/managedidentities
-./include/google/cloud/managedidentities/mocks
 ./include/google/cloud/managedidentities/v1
 ./include/google/cloud/managedidentities/v1/internal
 ./include/google/cloud/managedidentities/v1/mocks
@@ -900,7 +856,6 @@
 ./include/google/cloud/managedkafka/v1/internal
 ./include/google/cloud/managedkafka/v1/mocks
 ./include/google/cloud/memcache
-./include/google/cloud/memcache/mocks
 ./include/google/cloud/memcache/v1
 ./include/google/cloud/memcache/v1/internal
 ./include/google/cloud/memcache/v1/mocks
@@ -925,7 +880,6 @@
 ./include/google/cloud/monitoring/metricsscope/v1
 ./include/google/cloud/monitoring/metricsscope/v1/internal
 ./include/google/cloud/monitoring/metricsscope/v1/mocks
-./include/google/cloud/monitoring/mocks
 ./include/google/cloud/monitoring/v3
 ./include/google/cloud/monitoring/v3/internal
 ./include/google/cloud/monitoring/v3/mocks
@@ -934,12 +888,10 @@
 ./include/google/cloud/netapp/v1/internal
 ./include/google/cloud/netapp/v1/mocks
 ./include/google/cloud/networkconnectivity
-./include/google/cloud/networkconnectivity/mocks
 ./include/google/cloud/networkconnectivity/v1
 ./include/google/cloud/networkconnectivity/v1/internal
 ./include/google/cloud/networkconnectivity/v1/mocks
 ./include/google/cloud/networkmanagement
-./include/google/cloud/networkmanagement/mocks
 ./include/google/cloud/networkmanagement/v1
 ./include/google/cloud/networkmanagement/v1/internal
 ./include/google/cloud/networkmanagement/v1/mocks
@@ -952,7 +904,6 @@
 ./include/google/cloud/networkservices/v1/internal
 ./include/google/cloud/networkservices/v1/mocks
 ./include/google/cloud/notebooks
-./include/google/cloud/notebooks/mocks
 ./include/google/cloud/notebooks/v1
 ./include/google/cloud/notebooks/v1/internal
 ./include/google/cloud/notebooks/v1/mocks
@@ -960,7 +911,6 @@
 ./include/google/cloud/notebooks/v2/internal
 ./include/google/cloud/notebooks/v2/mocks
 ./include/google/cloud/optimization
-./include/google/cloud/optimization/mocks
 ./include/google/cloud/optimization/v1
 ./include/google/cloud/optimization/v1/internal
 ./include/google/cloud/optimization/v1/mocks
@@ -973,7 +923,6 @@
 ./include/google/cloud/orchestration/airflow/service
 ./include/google/cloud/orchestration/airflow/service/v1
 ./include/google/cloud/orgpolicy
-./include/google/cloud/orgpolicy/mocks
 ./include/google/cloud/orgpolicy/v2
 ./include/google/cloud/orgpolicy/v2/internal
 ./include/google/cloud/orgpolicy/v2/mocks
@@ -982,12 +931,10 @@
 ./include/google/cloud/osconfig/agentendpoint/v1
 ./include/google/cloud/osconfig/agentendpoint/v1/internal
 ./include/google/cloud/osconfig/agentendpoint/v1/mocks
-./include/google/cloud/osconfig/mocks
 ./include/google/cloud/osconfig/v1
 ./include/google/cloud/osconfig/v1/internal
 ./include/google/cloud/osconfig/v1/mocks
 ./include/google/cloud/oslogin
-./include/google/cloud/oslogin/mocks
 ./include/google/cloud/oslogin/v1
 ./include/google/cloud/oslogin/v1/internal
 ./include/google/cloud/oslogin/v1/mocks
@@ -1008,12 +955,10 @@
 ./include/google/cloud/policytroubleshooter/iam/v3
 ./include/google/cloud/policytroubleshooter/iam/v3/internal
 ./include/google/cloud/policytroubleshooter/iam/v3/mocks
-./include/google/cloud/policytroubleshooter/mocks
 ./include/google/cloud/policytroubleshooter/v1
 ./include/google/cloud/policytroubleshooter/v1/internal
 ./include/google/cloud/policytroubleshooter/v1/mocks
 ./include/google/cloud/privateca
-./include/google/cloud/privateca/mocks
 ./include/google/cloud/privateca/v1
 ./include/google/cloud/privateca/v1/internal
 ./include/google/cloud/privateca/v1/mocks
@@ -1022,7 +967,6 @@
 ./include/google/cloud/privilegedaccessmanager/v1/internal
 ./include/google/cloud/privilegedaccessmanager/v1/mocks
 ./include/google/cloud/profiler
-./include/google/cloud/profiler/mocks
 ./include/google/cloud/profiler/v2
 ./include/google/cloud/profiler/v2/internal
 ./include/google/cloud/profiler/v2/mocks
@@ -1049,7 +993,6 @@
 ./include/google/cloud/recaptchaenterprise/v1/internal
 ./include/google/cloud/recaptchaenterprise/v1/mocks
 ./include/google/cloud/recommender
-./include/google/cloud/recommender/mocks
 ./include/google/cloud/recommender/v1
 ./include/google/cloud/recommender/v1/internal
 ./include/google/cloud/recommender/v1/mocks
@@ -1058,32 +1001,26 @@
 ./include/google/cloud/redis/cluster/v1
 ./include/google/cloud/redis/cluster/v1/internal
 ./include/google/cloud/redis/cluster/v1/mocks
-./include/google/cloud/redis/mocks
 ./include/google/cloud/redis/v1
 ./include/google/cloud/redis/v1/internal
 ./include/google/cloud/redis/v1/mocks
 ./include/google/cloud/resourcemanager
-./include/google/cloud/resourcemanager/mocks
 ./include/google/cloud/resourcemanager/v3
 ./include/google/cloud/resourcemanager/v3/internal
 ./include/google/cloud/resourcemanager/v3/mocks
 ./include/google/cloud/retail
-./include/google/cloud/retail/mocks
 ./include/google/cloud/retail/v2
 ./include/google/cloud/retail/v2/internal
 ./include/google/cloud/retail/v2/mocks
 ./include/google/cloud/run
-./include/google/cloud/run/mocks
 ./include/google/cloud/run/v2
 ./include/google/cloud/run/v2/internal
 ./include/google/cloud/run/v2/mocks
 ./include/google/cloud/scheduler
-./include/google/cloud/scheduler/mocks
 ./include/google/cloud/scheduler/v1
 ./include/google/cloud/scheduler/v1/internal
 ./include/google/cloud/scheduler/v1/mocks
 ./include/google/cloud/secretmanager
-./include/google/cloud/secretmanager/mocks
 ./include/google/cloud/secretmanager/v1
 ./include/google/cloud/secretmanager/v1/internal
 ./include/google/cloud/secretmanager/v1/mocks
@@ -1097,7 +1034,6 @@
 ./include/google/cloud/security/publicca
 ./include/google/cloud/security/publicca/v1
 ./include/google/cloud/securitycenter
-./include/google/cloud/securitycenter/mocks
 ./include/google/cloud/securitycenter/v1
 ./include/google/cloud/securitycenter/v1/internal
 ./include/google/cloud/securitycenter/v1/mocks
@@ -1109,7 +1045,6 @@
 ./include/google/cloud/securitycentermanagement/v1/internal
 ./include/google/cloud/securitycentermanagement/v1/mocks
 ./include/google/cloud/servicecontrol
-./include/google/cloud/servicecontrol/mocks
 ./include/google/cloud/servicecontrol/v1
 ./include/google/cloud/servicecontrol/v1/internal
 ./include/google/cloud/servicecontrol/v1/mocks
@@ -1117,7 +1052,6 @@
 ./include/google/cloud/servicecontrol/v2/internal
 ./include/google/cloud/servicecontrol/v2/mocks
 ./include/google/cloud/servicedirectory
-./include/google/cloud/servicedirectory/mocks
 ./include/google/cloud/servicedirectory/v1
 ./include/google/cloud/servicedirectory/v1/internal
 ./include/google/cloud/servicedirectory/v1/mocks
@@ -1126,17 +1060,14 @@
 ./include/google/cloud/servicehealth/v1/internal
 ./include/google/cloud/servicehealth/v1/mocks
 ./include/google/cloud/servicemanagement
-./include/google/cloud/servicemanagement/mocks
 ./include/google/cloud/servicemanagement/v1
 ./include/google/cloud/servicemanagement/v1/internal
 ./include/google/cloud/servicemanagement/v1/mocks
 ./include/google/cloud/serviceusage
-./include/google/cloud/serviceusage/mocks
 ./include/google/cloud/serviceusage/v1
 ./include/google/cloud/serviceusage/v1/internal
 ./include/google/cloud/serviceusage/v1/mocks
 ./include/google/cloud/shell
-./include/google/cloud/shell/mocks
 ./include/google/cloud/shell/v1
 ./include/google/cloud/shell/v1/internal
 ./include/google/cloud/shell/v1/mocks
@@ -1146,7 +1077,6 @@
 ./include/google/cloud/spanner/admin/mocks
 ./include/google/cloud/spanner/internal
 ./include/google/cloud/speech
-./include/google/cloud/speech/mocks
 ./include/google/cloud/speech/v1
 ./include/google/cloud/speech/v1/internal
 ./include/google/cloud/speech/v1/mocks
@@ -1172,7 +1102,6 @@
 ./include/google/cloud/storageinsights/v1/internal
 ./include/google/cloud/storageinsights/v1/mocks
 ./include/google/cloud/storagetransfer
-./include/google/cloud/storagetransfer/mocks
 ./include/google/cloud/storagetransfer/v1
 ./include/google/cloud/storagetransfer/v1/internal
 ./include/google/cloud/storagetransfer/v1/mocks
@@ -1181,12 +1110,10 @@
 ./include/google/cloud/support/v2/internal
 ./include/google/cloud/support/v2/mocks
 ./include/google/cloud/talent
-./include/google/cloud/talent/mocks
 ./include/google/cloud/talent/v4
 ./include/google/cloud/talent/v4/internal
 ./include/google/cloud/talent/v4/mocks
 ./include/google/cloud/tasks
-./include/google/cloud/tasks/mocks
 ./include/google/cloud/tasks/v2
 ./include/google/cloud/tasks/v2/internal
 ./include/google/cloud/tasks/v2/mocks
@@ -1195,7 +1122,6 @@
 ./include/google/cloud/telcoautomation/v1/internal
 ./include/google/cloud/telcoautomation/v1/mocks
 ./include/google/cloud/texttospeech
-./include/google/cloud/texttospeech/mocks
 ./include/google/cloud/texttospeech/v1
 ./include/google/cloud/texttospeech/v1/internal
 ./include/google/cloud/texttospeech/v1/mocks
@@ -1204,7 +1130,6 @@
 ./include/google/cloud/timeseriesinsights/v1/internal
 ./include/google/cloud/timeseriesinsights/v1/mocks
 ./include/google/cloud/tpu
-./include/google/cloud/tpu/mocks
 ./include/google/cloud/tpu/v1
 ./include/google/cloud/tpu/v1/internal
 ./include/google/cloud/tpu/v1/mocks
@@ -1212,7 +1137,6 @@
 ./include/google/cloud/tpu/v2/internal
 ./include/google/cloud/tpu/v2/mocks
 ./include/google/cloud/trace
-./include/google/cloud/trace/mocks
 ./include/google/cloud/trace/v1
 ./include/google/cloud/trace/v1/internal
 ./include/google/cloud/trace/v1/mocks
@@ -1220,7 +1144,6 @@
 ./include/google/cloud/trace/v2/internal
 ./include/google/cloud/trace/v2/mocks
 ./include/google/cloud/translate
-./include/google/cloud/translate/mocks
 ./include/google/cloud/translate/v3
 ./include/google/cloud/translate/v3/internal
 ./include/google/cloud/translate/v3/mocks
@@ -1229,7 +1152,6 @@
 ./include/google/cloud/video/livestream/v1
 ./include/google/cloud/video/livestream/v1/internal
 ./include/google/cloud/video/livestream/v1/mocks
-./include/google/cloud/video/mocks
 ./include/google/cloud/video/stitcher
 ./include/google/cloud/video/stitcher/v1
 ./include/google/cloud/video/stitcher/v1/internal
@@ -1239,17 +1161,14 @@
 ./include/google/cloud/video/transcoder/v1/internal
 ./include/google/cloud/video/transcoder/v1/mocks
 ./include/google/cloud/videointelligence
-./include/google/cloud/videointelligence/mocks
 ./include/google/cloud/videointelligence/v1
 ./include/google/cloud/videointelligence/v1/internal
 ./include/google/cloud/videointelligence/v1/mocks
 ./include/google/cloud/vision
-./include/google/cloud/vision/mocks
 ./include/google/cloud/vision/v1
 ./include/google/cloud/vision/v1/internal
 ./include/google/cloud/vision/v1/mocks
 ./include/google/cloud/vmmigration
-./include/google/cloud/vmmigration/mocks
 ./include/google/cloud/vmmigration/v1
 ./include/google/cloud/vmmigration/v1/internal
 ./include/google/cloud/vmmigration/v1/mocks
@@ -1258,17 +1177,14 @@
 ./include/google/cloud/vmwareengine/v1/internal
 ./include/google/cloud/vmwareengine/v1/mocks
 ./include/google/cloud/vpcaccess
-./include/google/cloud/vpcaccess/mocks
 ./include/google/cloud/vpcaccess/v1
 ./include/google/cloud/vpcaccess/v1/internal
 ./include/google/cloud/vpcaccess/v1/mocks
 ./include/google/cloud/webrisk
-./include/google/cloud/webrisk/mocks
 ./include/google/cloud/webrisk/v1
 ./include/google/cloud/webrisk/v1/internal
 ./include/google/cloud/webrisk/v1/mocks
 ./include/google/cloud/websecurityscanner
-./include/google/cloud/websecurityscanner/mocks
 ./include/google/cloud/websecurityscanner/v1
 ./include/google/cloud/websecurityscanner/v1/internal
 ./include/google/cloud/websecurityscanner/v1/mocks
@@ -1277,7 +1193,6 @@
 ./include/google/cloud/workflows/executions/v1
 ./include/google/cloud/workflows/executions/v1/internal
 ./include/google/cloud/workflows/executions/v1/mocks
-./include/google/cloud/workflows/mocks
 ./include/google/cloud/workflows/v1
 ./include/google/cloud/workflows/v1/internal
 ./include/google/cloud/workflows/v1/mocks
diff --git a/doc/v3-migration-guide.md b/doc/v3-migration-guide.md
index ea99c7674a94c..b2ea23f60a432 100644
--- a/doc/v3-migration-guide.md
+++ b/doc/v3-migration-guide.md
@@ -129,6 +129,118 @@ google::cloud::CompletionQueue cq;
 
 </details>
 
+<details>
+<summary>Removed unversioned forwarding headers.
+</summary>
+
+Some early libraries were created without version and/or service directories.
+For backwards compatibility, forwarding headers were left at parent directory
+that pointed at the first version of the library:
+
+- google/cloud/accessapproval
+- google/cloud/accesscontextmanager
+- google/cloud/apigateway
+- google/cloud/apigeeconnect
+- google/cloud/apikeys
+- google/cloud/appengine
+- google/cloud/artifactregistry
+- google/cloud/asset
+- google/cloud/assuredworkloads
+- google/cloud/automl
+- google/cloud/baremetalsolution
+- google/cloud/batch
+- google/cloud/beyondcorp
+- google/cloud/bigquery
+- google/cloud/billing
+- google/cloud/binaryauthorization
+- google/cloud/certificatemanager
+- google/cloud/channel
+- google/cloud/cloudbuild
+- google/cloud/composer
+- google/cloud/connectors
+- google/cloud/contactcenterinsights
+- google/cloud/container
+- google/cloud/containeranalysis
+- google/cloud/datacatalog
+- google/cloud/datamigration
+- google/cloud/dataplex
+- google/cloud/dataproc
+- google/cloud/datastream
+- google/cloud/deploy
+- google/cloud/dlp
+- google/cloud/documentai
+- google/cloud/edgecontainer
+- google/cloud/eventarc
+- google/cloud/filestore
+- google/cloud/functions
+- google/cloud/gkehub
+- google/cloud/iam
+- google/cloud/iap
+- google/cloud/ids
+- google/cloud/kms
+- google/cloud/language
+- google/cloud/logging
+- google/cloud/managedidentities
+- google/cloud/memcache
+- google/cloud/monitoring
+- google/cloud/networkconnectivity
+- google/cloud/networkmanagement
+- google/cloud/notebooks
+- google/cloud/optimization
+- google/cloud/orgpolicy
+- google/cloud/osconfig
+- google/cloud/oslogin
+- google/cloud/policytroubleshooter
+- google/cloud/privateca
+- google/cloud/profiler
+- google/cloud/recommender
+- google/cloud/redis
+- google/cloud/resourcemanager
+- google/cloud/retail
+- google/cloud/run
+- google/cloud/scheduler
+- google/cloud/secretmanager
+- google/cloud/securitycenter
+- google/cloud/servicecontrol
+- google/cloud/servicedirectory
+- google/cloud/servicemanagement
+- google/cloud/serviceusage
+- google/cloud/shell
+- google/cloud/speech
+- google/cloud/storagetransfer
+- google/cloud/talent
+- google/cloud/tasks
+- google/cloud/texttospeech
+- google/cloud/tpu
+- google/cloud/trace
+- google/cloud/translate
+- google/cloud/video
+- google/cloud/videointelligence
+- google/cloud/vision
+- google/cloud/vmmigration
+- google/cloud/vpcaccess
+- google/cloud/webrisk
+- google/cloud/websecurityscanner
+- google/cloud/workflows
+
+For example, code that used to look like this:
+
+**Before:**
+
+```cpp
+#include "google/cloud/bigquery/bigquery_read_client.h"
+```
+
+Should be changed to this:
+
+**After:**
+
+```cpp
+#include "google/cloud/bigquery/storage/v1/bigquery_read_client.h"
+```
+
+</details>
+
 ### Bigquery
 
 <details>
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index c73b32393e338..c6533bdf68984 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -67,16 +67,6 @@ add_library(
     internal/format_class_comments.h
     internal/format_method_comments.cc
     internal/format_method_comments.h
-    internal/forwarding_client_generator.cc
-    internal/forwarding_client_generator.h
-    internal/forwarding_connection_generator.cc
-    internal/forwarding_connection_generator.h
-    internal/forwarding_idempotency_policy_generator.cc
-    internal/forwarding_idempotency_policy_generator.h
-    internal/forwarding_mock_connection_generator.cc
-    internal/forwarding_mock_connection_generator.h
-    internal/forwarding_options_generator.cc
-    internal/forwarding_options_generator.h
     internal/generator_interface.h
     internal/http_annotation_parser.cc
     internal/http_annotation_parser.h
diff --git a/generator/generator_config.proto b/generator/generator_config.proto
index 0423bc25ff0f9..40e94d9b00290 100644
--- a/generator/generator_config.proto
+++ b/generator/generator_config.proto
@@ -113,19 +113,6 @@ message ServiceConfiguration {
   // constructor and the connection factory function.
   bool experimental = 18;
 
-  // We use this setting to maintain backwards compatibility when relocating a
-  // service from the undesired `forwarding_product_path` to the desired
-  // `product_path`.
-  //
-  // If set, generate backwards compatibility headers at the
-  // `forwarding_product_path`. These headers define aliases (in the namespace
-  // derived from `forwarding_product_path`), which point to types defined at
-  // the `product_path` (in the namespace derived from `product_path`).
-  //
-  // For details on why we would relocate a service, see #10170, or
-  // https://github.com/googleapis/google-cloud-cpp/blob/main/doc/adr/2022-11-11-multiple-versions-of-GCP-service-in-one-library.md
-  string forwarding_product_path = 19;
-
   // Override idempotency policy values for specific rpcs.
   message IdempotencyOverride {
     // rpc_name should be qualified with the service name e.g.: Service.Method.
diff --git a/generator/generator_config.textproto b/generator/generator_config.textproto
index b963f3a5bc6f9..2baa260f186e1 100644
--- a/generator/generator_config.textproto
+++ b/generator/generator_config.textproto
@@ -20,14 +20,12 @@ service {
   product_path: "google/cloud/accessapproval/v1"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
-  forwarding_product_path: "google/cloud/accessapproval"
 }
 
 # Access Context Manager
 service {
   service_proto_path: "google/identity/accesscontextmanager/v1/access_context_manager.proto"
   product_path: "google/cloud/accesscontextmanager/v1"
-  forwarding_product_path: "google/cloud/accesscontextmanager"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -271,7 +269,6 @@ service {
 service {
   service_proto_path: "google/cloud/apigateway/v1/apigateway_service.proto"
   product_path: "google/cloud/apigateway/v1"
-  forwarding_product_path: "google/cloud/apigateway"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable", "kUnknown"]
 }
@@ -280,7 +277,6 @@ service {
 service {
   service_proto_path: "google/cloud/apigeeconnect/v1/connection.proto"
   product_path: "google/cloud/apigeeconnect/v1"
-  forwarding_product_path: "google/cloud/apigeeconnect"
   initial_copyright_year: "2022"
   service_endpoint_env_var: "GOOGLE_CLOUD_CPP_APIGEE_CONNECTION_SERVICE_ENDPOINT"
   retryable_status_codes: ["kUnavailable", "kUnknown"]
@@ -290,7 +286,6 @@ service {
 service {
   service_proto_path: "google/api/apikeys/v2/apikeys.proto"
   product_path: "google/cloud/apikeys/v2"
-  forwarding_product_path: "google/cloud/apikeys"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -300,7 +295,6 @@ service {
   service_proto_path: "google/appengine/v1/appengine.proto"
   additional_proto_files: ["google/appengine/v1/operation.proto"]
   product_path: "google/cloud/appengine/v1"
-  forwarding_product_path: "google/cloud/appengine"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -317,7 +311,6 @@ service {
 service {
   service_proto_path: "google/devtools/artifactregistry/v1/service.proto"
   product_path: "google/cloud/artifactregistry/v1"
-  forwarding_product_path: "google/cloud/artifactregistry"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -326,7 +319,6 @@ service {
 service {
   service_proto_path: "google/cloud/asset/v1/asset_service.proto"
   product_path: "google/cloud/asset/v1"
-  forwarding_product_path: "google/cloud/asset"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -335,7 +327,6 @@ service {
 service {
   service_proto_path: "google/cloud/assuredworkloads/v1/assuredworkloads.proto"
   product_path: "google/cloud/assuredworkloads/v1"
-  forwarding_product_path: "google/cloud/assuredworkloads"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -345,7 +336,6 @@ service {
   service_proto_path: "google/cloud/automl/v1/service.proto"
   additional_proto_files: ["google/cloud/automl/v1/operations.proto"]
   product_path: "google/cloud/automl/v1"
-  forwarding_product_path: "google/cloud/automl"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -354,7 +344,6 @@ service {
   service_proto_path: "google/cloud/automl/v1/prediction_service.proto"
   additional_proto_files: ["google/cloud/automl/v1/operations.proto"]
   product_path: "google/cloud/automl/v1"
-  forwarding_product_path: "google/cloud/automl"
   initial_copyright_year: "2022"
   service_endpoint_env_var: "GOOGLE_CLOUD_CPP_AUTOML_PREDICTION_SERVICE_ENDPOINT"
   retryable_status_codes: ["kUnavailable"]
@@ -372,7 +361,6 @@ service {
 service {
   service_proto_path: "google/cloud/baremetalsolution/v2/baremetalsolution.proto"
   product_path: "google/cloud/baremetalsolution/v2"
-  forwarding_product_path: "google/cloud/baremetalsolution"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -381,7 +369,6 @@ service {
 service {
   service_proto_path: "google/cloud/batch/v1/batch.proto"
   product_path: "google/cloud/batch/v1"
-  forwarding_product_path: "google/cloud/batch"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -390,7 +377,6 @@ service {
 service {
   service_proto_path: "google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto"
   product_path: "google/cloud/beyondcorp/appconnectors/v1"
-  forwarding_product_path: "google/cloud/beyondcorp"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -398,7 +384,6 @@ service {
 service {
   service_proto_path: "google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto"
   product_path: "google/cloud/beyondcorp/appgateways/v1"
-  forwarding_product_path: "google/cloud/beyondcorp"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -406,7 +391,6 @@ service {
 service {
   service_proto_path: "google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto"
   product_path: "google/cloud/beyondcorp/appconnections/v1"
-  forwarding_product_path: "google/cloud/beyondcorp"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -415,7 +399,6 @@ service {
 service {
   service_proto_path: "google/cloud/bigquery/analyticshub/v1/analyticshub.proto"
   product_path: "google/cloud/bigquery/analyticshub/v1"
-  forwarding_product_path: "google/cloud/bigquery"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -430,7 +413,6 @@ service {
 service {
   service_proto_path: "google/cloud/bigquery/connection/v1/connection.proto"
   product_path: "google/cloud/bigquery/connection/v1"
-  forwarding_product_path: "google/cloud/bigquery"
   initial_copyright_year: "2022"
   service_endpoint_env_var: "GOOGLE_CLOUD_CPP_BIGQUERY_CONNECTION_SERVICE_ENDPOINT"
   retryable_status_codes: ["kUnavailable"]
@@ -439,7 +421,6 @@ service {
 service {
   service_proto_path: "google/cloud/bigquery/datapolicies/v1/datapolicy.proto"
   product_path: "google/cloud/bigquery/datapolicies/v1"
-  forwarding_product_path: "google/cloud/bigquery"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -454,7 +435,6 @@ service {
 service {
   service_proto_path: "google/cloud/bigquery/datatransfer/v1/datatransfer.proto"
   product_path: "google/cloud/bigquery/datatransfer/v1"
-  forwarding_product_path: "google/cloud/bigquery"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -462,7 +442,6 @@ service {
 service {
   service_proto_path: "google/cloud/bigquery/migration/v2/migration_service.proto"
   product_path: "google/cloud/bigquery/migration/v2"
-  forwarding_product_path: "google/cloud/bigquery"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -470,7 +449,6 @@ service {
 service {
   service_proto_path: "google/cloud/bigquery/reservation/v1/reservation.proto"
   product_path: "google/cloud/bigquery/reservation/v1"
-  forwarding_product_path: "google/cloud/bigquery"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -478,7 +456,6 @@ service {
 service {
   service_proto_path: "google/cloud/bigquery/storage/v1/storage.proto"
   product_path: "google/cloud/bigquery/storage/v1"
-  forwarding_product_path: "google/cloud/bigquery"
   initial_copyright_year: "2021"
   omitted_services: ["BigQueryWrite"]
   retryable_status_codes: ["kUnavailable"]
@@ -488,7 +465,6 @@ service {
 service {
   service_proto_path: "google/cloud/bigquery/storage/v1/storage.proto"
   product_path: "google/cloud/bigquery/storage/v1"
-  forwarding_product_path: "google/cloud/bigquery"
   initial_copyright_year: "2022"
   omitted_services: ["BigQueryRead"]
   retryable_status_codes: ["kUnavailable"]
@@ -618,7 +594,6 @@ service {
 service {
   service_proto_path: "google/cloud/billing/v1/cloud_billing.proto"
   product_path: "google/cloud/billing/v1"
-  forwarding_product_path: "google/cloud/billing"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -626,7 +601,6 @@ service {
 service {
   service_proto_path: "google/cloud/billing/v1/cloud_catalog.proto"
   product_path: "google/cloud/billing/v1"
-  forwarding_product_path: "google/cloud/billing"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -634,7 +608,6 @@ service {
 service {
   service_proto_path: "google/cloud/billing/budgets/v1/budget_service.proto"
   product_path: "google/cloud/billing/budgets/v1"
-  forwarding_product_path: "google/cloud/billing"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -643,7 +616,6 @@ service {
 service {
   service_proto_path: "google/cloud/binaryauthorization/v1/service.proto"
   product_path: "google/cloud/binaryauthorization/v1"
-  forwarding_product_path: "google/cloud/binaryauthorization"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -652,7 +624,6 @@ service {
 service {
   service_proto_path: "google/cloud/security/privateca/v1/service.proto"
   product_path: "google/cloud/privateca/v1"
-  forwarding_product_path: "google/cloud/privateca"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable", "kUnknown"]
 }
@@ -668,7 +639,6 @@ service {
 service {
   service_proto_path: "google/cloud/certificatemanager/v1/certificate_manager.proto"
   product_path: "google/cloud/certificatemanager/v1"
-  forwarding_product_path: "google/cloud/certificatemanager"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -713,7 +683,6 @@ service {
 service {
   service_proto_path: "google/devtools/cloudbuild/v1/cloudbuild.proto"
   product_path: "google/cloud/cloudbuild/v1"
-  forwarding_product_path: "google/cloud/cloudbuild"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -739,7 +708,6 @@ service {
   service_proto_path: "google/cloud/channel/v1/service.proto"
   additional_proto_files: ["google/cloud/channel/v1/operations.proto"]
   product_path: "google/cloud/channel/v1"
-  forwarding_product_path: "google/cloud/channel"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -787,7 +755,6 @@ service {
   service_proto_path: "google/cloud/orchestration/airflow/service/v1/environments.proto"
   additional_proto_files: ["google/cloud/orchestration/airflow/service/v1/operations.proto"]
   product_path: "google/cloud/composer/v1"
-  forwarding_product_path: "google/cloud/composer"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -795,7 +762,6 @@ service {
 service {
   service_proto_path: "google/cloud/orchestration/airflow/service/v1/image_versions.proto"
   product_path: "google/cloud/composer/v1"
-  forwarding_product_path: "google/cloud/composer"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1781,7 +1747,6 @@ service {
 service {
   service_proto_path: "google/cloud/connectors/v1/connectors_service.proto"
   product_path: "google/cloud/connectors/v1"
-  forwarding_product_path: "google/cloud/connectors"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1790,7 +1755,6 @@ service {
 service {
   service_proto_path: "google/cloud/contactcenterinsights/v1/contact_center_insights.proto"
   product_path: "google/cloud/contactcenterinsights/v1"
-  forwarding_product_path: "google/cloud/contactcenterinsights"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1799,7 +1763,6 @@ service {
 service {
   service_proto_path: "google/container/v1/cluster_service.proto"
   product_path: "google/cloud/container/v1"
-  forwarding_product_path: "google/cloud/container"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   omitted_rpcs: [
@@ -1834,7 +1797,6 @@ service {
   service_proto_path: "google/devtools/containeranalysis/v1/containeranalysis.proto"
   additional_proto_files: ["grafeas/v1/grafeas.proto"]
   product_path: "google/cloud/containeranalysis/v1"
-  forwarding_product_path: "google/cloud/containeranalysis"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1894,7 +1856,6 @@ service {
 service {
   service_proto_path: "google/cloud/datacatalog/v1/datacatalog.proto"
   product_path: "google/cloud/datacatalog/v1"
-  forwarding_product_path: "google/cloud/datacatalog"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1902,7 +1863,6 @@ service {
 service {
   service_proto_path: "google/cloud/datacatalog/v1/policytagmanager.proto"
   product_path: "google/cloud/datacatalog/v1"
-  forwarding_product_path: "google/cloud/datacatalog"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1910,7 +1870,6 @@ service {
 service {
   service_proto_path: "google/cloud/datacatalog/v1/policytagmanagerserialization.proto"
   product_path: "google/cloud/datacatalog/v1"
-  forwarding_product_path: "google/cloud/datacatalog"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1926,7 +1885,6 @@ service {
 service {
   service_proto_path: "google/cloud/clouddms/v1/clouddms.proto"
   product_path: "google/cloud/datamigration/v1"
-  forwarding_product_path: "google/cloud/datamigration"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1950,7 +1908,6 @@ service {
 service {
   service_proto_path: "google/cloud/dataplex/v1/content.proto"
   product_path: "google/cloud/dataplex/v1"
-  forwarding_product_path: "google/cloud/dataplex"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1972,7 +1929,6 @@ service {
 service {
   service_proto_path: "google/cloud/dataplex/v1/metadata.proto"
   product_path: "google/cloud/dataplex/v1"
-  forwarding_product_path: "google/cloud/dataplex"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1980,7 +1936,6 @@ service {
 service {
   service_proto_path: "google/cloud/dataplex/v1/service.proto"
   product_path: "google/cloud/dataplex/v1"
-  forwarding_product_path: "google/cloud/dataplex"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -1989,7 +1944,6 @@ service {
 service {
   service_proto_path: "google/cloud/dataproc/v1/autoscaling_policies.proto"
   product_path: "google/cloud/dataproc/v1"
-  forwarding_product_path: "google/cloud/dataproc"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   endpoint_location_style: LOCATION_DEPENDENT_COMPAT
@@ -1999,7 +1953,6 @@ service {
   service_proto_path: "google/cloud/dataproc/v1/batches.proto"
   additional_proto_files: ["google/cloud/dataproc/v1/operations.proto"]
   product_path: "google/cloud/dataproc/v1"
-  forwarding_product_path: "google/cloud/dataproc"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   endpoint_location_style: LOCATION_DEPENDENT_COMPAT
@@ -2009,7 +1962,6 @@ service {
   service_proto_path: "google/cloud/dataproc/v1/clusters.proto"
   additional_proto_files: ["google/cloud/dataproc/v1/operations.proto"]
   product_path: "google/cloud/dataproc/v1"
-  forwarding_product_path: "google/cloud/dataproc"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   endpoint_location_style: LOCATION_DEPENDENT_COMPAT
@@ -2018,7 +1970,6 @@ service {
 service {
   service_proto_path: "google/cloud/dataproc/v1/jobs.proto"
   product_path: "google/cloud/dataproc/v1"
-  forwarding_product_path: "google/cloud/dataproc"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   endpoint_location_style: LOCATION_DEPENDENT_COMPAT
@@ -2053,7 +2004,6 @@ service {
 service {
   service_proto_path: "google/cloud/dataproc/v1/workflow_templates.proto"
   product_path: "google/cloud/dataproc/v1"
-  forwarding_product_path: "google/cloud/dataproc"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   endpoint_location_style: LOCATION_DEPENDENT_COMPAT
@@ -2063,7 +2013,6 @@ service {
 service {
   service_proto_path: "google/privacy/dlp/v2/dlp.proto"
   product_path: "google/cloud/dlp/v2"
-  forwarding_product_path: "google/cloud/dlp"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2089,7 +2038,6 @@ service {
 service {
   service_proto_path: "google/cloud/datastream/v1/datastream.proto"
   product_path: "google/cloud/datastream/v1"
-  forwarding_product_path: "google/cloud/datastream"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2098,7 +2046,6 @@ service {
 service {
   service_proto_path: "google/cloud/deploy/v1/cloud_deploy.proto"
   product_path: "google/cloud/deploy/v1"
-  forwarding_product_path: "google/cloud/deploy"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2523,7 +2470,6 @@ service {
 service {
   service_proto_path: "google/cloud/documentai/v1/document_processor_service.proto"
   product_path: "google/cloud/documentai/v1"
-  forwarding_product_path: "google/cloud/documentai"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   endpoint_location_style: LOCATION_DEPENDENT_COMPAT
@@ -2541,7 +2487,6 @@ service {
 service {
   service_proto_path: "google/cloud/edgecontainer/v1/service.proto"
   product_path: "google/cloud/edgecontainer/v1"
-  forwarding_product_path: "google/cloud/edgecontainer"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2566,7 +2511,6 @@ service {
 service {
   service_proto_path: "google/cloud/eventarc/v1/eventarc.proto"
   product_path: "google/cloud/eventarc/v1"
-  forwarding_product_path: "google/cloud/eventarc"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable", "kUnknown"]
 }
@@ -2574,7 +2518,6 @@ service {
 service {
   service_proto_path: "google/cloud/eventarc/publishing/v1/publisher.proto"
   product_path: "google/cloud/eventarc/publishing/v1"
-  forwarding_product_path: "google/cloud/eventarc"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2583,7 +2526,6 @@ service {
 service {
   service_proto_path: "google/cloud/filestore/v1/cloud_filestore_service.proto"
   product_path: "google/cloud/filestore/v1"
-  forwarding_product_path: "google/cloud/filestore"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2600,7 +2542,6 @@ service {
   service_proto_path: "google/cloud/functions/v1/functions.proto"
   additional_proto_files: ["google/cloud/functions/v1/operations.proto"]
   product_path: "google/cloud/functions/v1"
-  forwarding_product_path: "google/cloud/functions"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2624,7 +2565,6 @@ service {
 service {
   service_proto_path: "google/cloud/gkehub/v1/service.proto"
   product_path: "google/cloud/gkehub/v1"
-  forwarding_product_path: "google/cloud/gkehub"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2668,7 +2608,6 @@ service {
 service {
   service_proto_path: "google/iam/credentials/v1/iamcredentials.proto"
   product_path: "google/cloud/iam/credentials/v1"
-  forwarding_product_path: "google/cloud/iam"
   initial_copyright_year: "2020"
   retryable_status_codes: ["kUnavailable"]
   idempotency_overrides: [
@@ -2682,7 +2621,6 @@ service {
 service {
   service_proto_path: "google/iam/admin/v1/iam.proto"
   product_path: "google/cloud/iam/admin/v1"
-  forwarding_product_path: "google/cloud/iam"
   initial_copyright_year: "2021"
   omitted_rpcs: ["SignBlob", "SignJwt", "UpdateServiceAccount"]
   retryable_status_codes: ["kUnavailable"]
@@ -2702,7 +2640,6 @@ service {
 service {
   service_proto_path: "google/iam/v1/iam_policy.proto"
   product_path: "google/cloud/iam/v1"
-  forwarding_product_path: "google/cloud/iam"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2732,7 +2669,6 @@ service {
 service {
   service_proto_path: "google/cloud/iap/v1/service.proto"
   product_path: "google/cloud/iap/v1"
-  forwarding_product_path: "google/cloud/iap"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2749,7 +2685,6 @@ service {
 service {
   service_proto_path: "google/cloud/policytroubleshooter/v1/checker.proto"
   product_path: "google/cloud/policytroubleshooter/v1"
-  forwarding_product_path: "google/cloud/policytroubleshooter"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2765,7 +2700,6 @@ service {
 service {
   service_proto_path: "google/cloud/ids/v1/ids.proto"
   product_path: "google/cloud/ids/v1"
-  forwarding_product_path: "google/cloud/ids"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2788,7 +2722,6 @@ service {
 service {
   service_proto_path: "google/cloud/kms/v1/service.proto"
   product_path: "google/cloud/kms/v1"
-  forwarding_product_path: "google/cloud/kms"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2796,7 +2729,6 @@ service {
 service {
   service_proto_path: "google/cloud/kms/v1/ekm_service.proto"
   product_path: "google/cloud/kms/v1"
-  forwarding_product_path: "google/cloud/kms"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2819,7 +2751,6 @@ service {
 service {
   service_proto_path: "google/cloud/language/v1/language_service.proto"
   product_path: "google/cloud/language/v1"
-  forwarding_product_path: "google/cloud/language"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2843,7 +2774,6 @@ service {
 service {
   service_proto_path: "google/logging/v2/logging.proto"
   product_path: "google/cloud/logging/v2"
-  forwarding_product_path: "google/cloud/logging"
   initial_copyright_year: "2021"
   gen_async_rpcs: ["WriteLogEntries"]
   retryable_status_codes: ["kInternal", "kUnavailable"]
@@ -2885,7 +2815,6 @@ service {
 service {
   service_proto_path: "google/cloud/managedidentities/v1/managed_identities_service.proto"
   product_path: "google/cloud/managedidentities/v1"
-  forwarding_product_path: "google/cloud/managedidentities"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2910,7 +2839,6 @@ service {
 service {
   service_proto_path: "google/cloud/memcache/v1/cloud_memcache.proto"
   product_path: "google/cloud/memcache/v1"
-  forwarding_product_path: "google/cloud/memcache"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2950,7 +2878,6 @@ service {
 service {
   service_proto_path: "google/monitoring/v3/alert_service.proto"
   product_path: "google/cloud/monitoring/v3"
-  forwarding_product_path: "google/cloud/monitoring"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2958,7 +2885,6 @@ service {
 service {
   service_proto_path: "google/monitoring/v3/group_service.proto"
   product_path: "google/cloud/monitoring/v3"
-  forwarding_product_path: "google/cloud/monitoring"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2966,7 +2892,6 @@ service {
 service {
   service_proto_path: "google/monitoring/v3/metric_service.proto"
   product_path: "google/cloud/monitoring/v3"
-  forwarding_product_path: "google/cloud/monitoring"
   initial_copyright_year: "2022"
   gen_async_rpcs: ["CreateTimeSeries"]
   retryable_status_codes: ["kUnavailable"]
@@ -2975,7 +2900,6 @@ service {
 service {
   service_proto_path: "google/monitoring/v3/notification_service.proto"
   product_path: "google/cloud/monitoring/v3"
-  forwarding_product_path: "google/cloud/monitoring"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2983,7 +2907,6 @@ service {
 service {
   service_proto_path: "google/monitoring/v3/query_service.proto"
   product_path: "google/cloud/monitoring/v3"
-  forwarding_product_path: "google/cloud/monitoring"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -2991,7 +2914,6 @@ service {
 service {
   service_proto_path: "google/monitoring/v3/service_service.proto"
   product_path: "google/cloud/monitoring/v3"
-  forwarding_product_path: "google/cloud/monitoring"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3006,7 +2928,6 @@ service {
 service {
   service_proto_path: "google/monitoring/v3/uptime_service.proto"
   product_path: "google/cloud/monitoring/v3"
-  forwarding_product_path: "google/cloud/monitoring"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3014,7 +2935,6 @@ service {
 service {
   service_proto_path: "google/monitoring/dashboard/v1/dashboards_service.proto"
   product_path: "google/cloud/monitoring/dashboard/v1"
-  forwarding_product_path: "google/cloud/monitoring"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3022,7 +2942,6 @@ service {
 service {
   service_proto_path: "google/monitoring/metricsscope/v1/metrics_scopes.proto"
   product_path: "google/cloud/monitoring/metricsscope/v1"
-  forwarding_product_path: "google/cloud/monitoring"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3040,7 +2959,6 @@ service {
   service_proto_path: "google/cloud/networkconnectivity/v1/hub.proto"
   additional_proto_files: ["google/cloud/networkconnectivity/v1/common.proto"]
   product_path: "google/cloud/networkconnectivity/v1"
-  forwarding_product_path: "google/cloud/networkconnectivity"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3063,7 +2981,6 @@ service {
 service {
   service_proto_path: "google/cloud/networkmanagement/v1/reachability.proto"
   product_path: "google/cloud/networkmanagement/v1"
-  forwarding_product_path: "google/cloud/networkmanagement"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3098,7 +3015,6 @@ service {
   service_proto_path: "google/cloud/notebooks/v1/managed_service.proto"
   additional_proto_files: ["google/cloud/notebooks/v1/service.proto"]
   product_path: "google/cloud/notebooks/v1"
-  forwarding_product_path: "google/cloud/notebooks"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3114,7 +3030,6 @@ service {
 service {
   service_proto_path: "google/cloud/optimization/v1/fleet_routing.proto"
   product_path: "google/cloud/optimization/v1"
-  forwarding_product_path: "google/cloud/optimization"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3131,7 +3046,6 @@ service {
 service {
   service_proto_path: "google/cloud/orgpolicy/v2/orgpolicy.proto"
   product_path: "google/cloud/orgpolicy/v2"
-  forwarding_product_path: "google/cloud/orgpolicy"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3140,7 +3054,6 @@ service {
 service {
   service_proto_path: "google/cloud/osconfig/v1/osconfig_service.proto"
   product_path: "google/cloud/osconfig/v1"
-  forwarding_product_path: "google/cloud/osconfig"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3155,7 +3068,6 @@ service {
 service {
   service_proto_path: "google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto"
   product_path: "google/cloud/osconfig/agentendpoint/v1"
-  forwarding_product_path: "google/cloud/osconfig"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   # For this service, updating the streaming RPC is a no-op.  The response has
@@ -3168,7 +3080,6 @@ service {
 service {
   service_proto_path: "google/cloud/oslogin/v1/oslogin.proto"
   product_path: "google/cloud/oslogin/v1"
-  forwarding_product_path: "google/cloud/oslogin"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3194,7 +3105,6 @@ service {
 service {
   service_proto_path: "google/devtools/cloudprofiler/v2/profiler.proto"
   product_path: "google/cloud/profiler/v2"
-  forwarding_product_path: "google/cloud/profiler"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   omitted_services: ["ExportService"]
@@ -3338,7 +3248,6 @@ service {
 service {
   service_proto_path: "google/cloud/recommender/v1/recommender_service.proto"
   product_path: "google/cloud/recommender/v1"
-  forwarding_product_path: "google/cloud/recommender"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3347,7 +3256,6 @@ service {
 service {
   service_proto_path: "google/cloud/redis/v1/cloud_redis.proto"
   product_path: "google/cloud/redis/v1"
-  forwarding_product_path: "google/cloud/redis"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3363,7 +3271,6 @@ service {
 service {
   service_proto_path: "google/cloud/resourcemanager/v3/folders.proto"
   product_path: "google/cloud/resourcemanager/v3"
-  forwarding_product_path: "google/cloud/resourcemanager"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   endpoint_location_style: LOCATION_OPTIONALLY_DEPENDENT
@@ -3372,7 +3279,6 @@ service {
 service {
   service_proto_path: "google/cloud/resourcemanager/v3/organizations.proto"
   product_path: "google/cloud/resourcemanager/v3"
-  forwarding_product_path: "google/cloud/resourcemanager"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   endpoint_location_style: LOCATION_OPTIONALLY_DEPENDENT
@@ -3381,7 +3287,6 @@ service {
 service {
   service_proto_path: "google/cloud/resourcemanager/v3/projects.proto"
   product_path: "google/cloud/resourcemanager/v3"
-  forwarding_product_path: "google/cloud/resourcemanager"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   endpoint_location_style: LOCATION_OPTIONALLY_DEPENDENT
@@ -3430,7 +3335,6 @@ service {
 service {
   service_proto_path: "google/cloud/retail/v2/catalog_service.proto"
   product_path: "google/cloud/retail/v2"
-  forwarding_product_path: "google/cloud/retail"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3438,7 +3342,6 @@ service {
 service {
   service_proto_path: "google/cloud/retail/v2/completion_service.proto"
   product_path: "google/cloud/retail/v2"
-  forwarding_product_path: "google/cloud/retail"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3460,7 +3363,6 @@ service {
 service {
   service_proto_path: "google/cloud/retail/v2/prediction_service.proto"
   product_path: "google/cloud/retail/v2"
-  forwarding_product_path: "google/cloud/retail"
   initial_copyright_year: "2022"
   service_endpoint_env_var: "GOOGLE_CLOUD_CPP_RETAIL_PREDICTION_SERVICE_ENDPOINT"
   retryable_status_codes: ["kUnavailable"]
@@ -3469,7 +3371,6 @@ service {
 service {
   service_proto_path: "google/cloud/retail/v2/product_service.proto"
   product_path: "google/cloud/retail/v2"
-  forwarding_product_path: "google/cloud/retail"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3477,7 +3378,6 @@ service {
 service {
   service_proto_path: "google/cloud/retail/v2/search_service.proto"
   product_path: "google/cloud/retail/v2"
-  forwarding_product_path: "google/cloud/retail"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3492,7 +3392,6 @@ service {
 service {
   service_proto_path: "google/cloud/retail/v2/user_event_service.proto"
   product_path: "google/cloud/retail/v2"
-  forwarding_product_path: "google/cloud/retail"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3509,7 +3408,6 @@ service {
 service {
   service_proto_path: "google/cloud/run/v2/revision.proto"
   product_path: "google/cloud/run/v2"
-  forwarding_product_path: "google/cloud/run"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3517,7 +3415,6 @@ service {
 service {
   service_proto_path: "google/cloud/run/v2/service.proto"
   product_path: "google/cloud/run/v2"
-  forwarding_product_path: "google/cloud/run"
   initial_copyright_year: "2022"
   service_endpoint_env_var: "GOOGLE_CLOUD_CPP_RUN_SERVICES_ENDPOINT"
   retryable_status_codes: ["kUnavailable"]
@@ -3534,7 +3431,6 @@ service {
 service {
   service_proto_path: "google/cloud/scheduler/v1/cloudscheduler.proto"
   product_path: "google/cloud/scheduler/v1"
-  forwarding_product_path: "google/cloud/scheduler"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3543,7 +3439,6 @@ service {
 service {
   service_proto_path: "google/cloud/secretmanager/v1/service.proto"
   product_path: "google/cloud/secretmanager/v1"
-  forwarding_product_path: "google/cloud/secretmanager"
   initial_copyright_year: "2021"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3560,7 +3455,6 @@ service {
 service {
   service_proto_path: "google/cloud/securitycenter/v1/securitycenter_service.proto"
   product_path: "google/cloud/securitycenter/v1"
-  forwarding_product_path: "google/cloud/securitycenter"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3584,7 +3478,6 @@ service {
 service {
   service_proto_path: "google/api/servicecontrol/v1/quota_controller.proto"
   product_path: "google/cloud/servicecontrol/v1"
-  forwarding_product_path: "google/cloud/servicecontrol"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3592,7 +3485,6 @@ service {
 service {
   service_proto_path: "google/api/servicecontrol/v1/service_controller.proto"
   product_path: "google/cloud/servicecontrol/v1"
-  forwarding_product_path: "google/cloud/servicecontrol"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3608,7 +3500,6 @@ service {
 service {
   service_proto_path: "google/cloud/servicedirectory/v1/lookup_service.proto"
   product_path: "google/cloud/servicedirectory/v1"
-  forwarding_product_path: "google/cloud/servicedirectory"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable", "kUnknown"]
 }
@@ -3616,7 +3507,6 @@ service {
 service {
   service_proto_path: "google/cloud/servicedirectory/v1/registration_service.proto"
   product_path: "google/cloud/servicedirectory/v1"
-  forwarding_product_path: "google/cloud/servicedirectory"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable", "kUnknown"]
 }
@@ -3633,7 +3523,6 @@ service {
 service {
   service_proto_path: "google/api/servicemanagement/v1/servicemanager.proto"
   product_path: "google/cloud/servicemanagement/v1"
-  forwarding_product_path: "google/cloud/servicemanagement"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
   omitted_rpcs: [
@@ -3645,7 +3534,6 @@ service {
 service {
   service_proto_path: "google/api/serviceusage/v1/serviceusage.proto"
   product_path: "google/cloud/serviceusage/v1"
-  forwarding_product_path: "google/cloud/serviceusage"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3654,7 +3542,6 @@ service {
 service {
   service_proto_path: "google/cloud/shell/v1/cloudshell.proto"
   product_path: "google/cloud/shell/v1"
-  forwarding_product_path: "google/cloud/shell"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable", "kUnknown"]
 }
@@ -3708,7 +3595,6 @@ service {
 service {
   service_proto_path: "google/cloud/speech/v1/cloud_speech.proto"
   product_path: "google/cloud/speech/v1"
-  forwarding_product_path: "google/cloud/speech"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3963,7 +3849,6 @@ service {
 service {
   service_proto_path: "google/storagetransfer/v1/transfer.proto"
   product_path: "google/cloud/storagetransfer/v1"
-  forwarding_product_path: "google/cloud/storagetransfer"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3972,7 +3857,6 @@ service {
 service {
   service_proto_path: "google/cloud/talent/v4/company_service.proto"
   product_path: "google/cloud/talent/v4"
-  forwarding_product_path: "google/cloud/talent"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3980,7 +3864,6 @@ service {
 service {
   service_proto_path: "google/cloud/talent/v4/completion_service.proto"
   product_path: "google/cloud/talent/v4"
-  forwarding_product_path: "google/cloud/talent"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3988,7 +3871,6 @@ service {
 service {
   service_proto_path: "google/cloud/talent/v4/event_service.proto"
   product_path: "google/cloud/talent/v4"
-  forwarding_product_path: "google/cloud/talent"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -3996,7 +3878,6 @@ service {
 service {
   service_proto_path: "google/cloud/talent/v4/job_service.proto"
   product_path: "google/cloud/talent/v4"
-  forwarding_product_path: "google/cloud/talent"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4004,7 +3885,6 @@ service {
 service {
   service_proto_path: "google/cloud/talent/v4/tenant_service.proto"
   product_path: "google/cloud/talent/v4"
-  forwarding_product_path: "google/cloud/talent"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4013,7 +3893,6 @@ service {
 service {
   service_proto_path: "google/cloud/tasks/v2/cloudtasks.proto"
   product_path: "google/cloud/tasks/v2"
-  forwarding_product_path: "google/cloud/tasks"
   initial_copyright_year: "2021"
   retryable_status_codes: ["kInternal", "kUnavailable"]
 }
@@ -4030,7 +3909,6 @@ service {
 service {
   service_proto_path: "google/cloud/texttospeech/v1/cloud_tts.proto"
   product_path: "google/cloud/texttospeech/v1"
-  forwarding_product_path: "google/cloud/texttospeech"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4049,7 +3927,6 @@ service {
   product_path: "google/cloud/tpu/v1"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
-  forwarding_product_path: "google/cloud/tpu"
 }
 
 service {
@@ -4073,7 +3950,6 @@ service {
 service {
   service_proto_path: "google/devtools/cloudtrace/v2/tracing.proto"
   product_path: "google/cloud/trace/v2"
-  forwarding_product_path: "google/cloud/trace"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4082,7 +3958,6 @@ service {
 service {
   service_proto_path: "google/cloud/translate/v3/translation_service.proto"
   product_path: "google/cloud/translate/v3"
-  forwarding_product_path: "google/cloud/translate"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4091,7 +3966,6 @@ service {
 service {
   service_proto_path: "google/cloud/video/livestream/v1/service.proto"
   product_path: "google/cloud/video/livestream/v1"
-  forwarding_product_path: "google/cloud/video"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4099,7 +3973,6 @@ service {
 service {
   service_proto_path: "google/cloud/video/stitcher/v1/video_stitcher_service.proto"
   product_path: "google/cloud/video/stitcher/v1"
-  forwarding_product_path: "google/cloud/video"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4107,7 +3980,6 @@ service {
 service {
   service_proto_path: "google/cloud/video/transcoder/v1/services.proto"
   product_path: "google/cloud/video/transcoder/v1"
-  forwarding_product_path: "google/cloud/video"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4116,7 +3988,6 @@ service {
 service {
   service_proto_path: "google/cloud/videointelligence/v1/video_intelligence.proto"
   product_path: "google/cloud/videointelligence/v1"
-  forwarding_product_path: "google/cloud/videointelligence"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4125,7 +3996,6 @@ service {
 service {
   service_proto_path: "google/cloud/vision/v1/image_annotator.proto"
   product_path: "google/cloud/vision/v1"
-  forwarding_product_path: "google/cloud/vision"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4133,7 +4003,6 @@ service {
 service {
   service_proto_path: "google/cloud/vision/v1/product_search_service.proto"
   product_path: "google/cloud/vision/v1"
-  forwarding_product_path: "google/cloud/vision"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4142,7 +4011,6 @@ service {
 service {
   service_proto_path: "google/cloud/vmmigration/v1/vmmigration.proto"
   product_path: "google/cloud/vmmigration/v1"
-  forwarding_product_path: "google/cloud/vmmigration"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4159,7 +4027,6 @@ service {
 service {
   service_proto_path: "google/cloud/vpcaccess/v1/vpc_access.proto"
   product_path: "google/cloud/vpcaccess/v1"
-  forwarding_product_path: "google/cloud/vpcaccess"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable", "kUnknown"]
 }
@@ -4168,7 +4035,6 @@ service {
 service {
   service_proto_path: "google/cloud/webrisk/v1/webrisk.proto"
   product_path: "google/cloud/webrisk/v1"
-  forwarding_product_path: "google/cloud/webrisk"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4177,7 +4043,6 @@ service {
 service {
   service_proto_path: "google/cloud/websecurityscanner/v1/web_security_scanner.proto"
   product_path: "google/cloud/websecurityscanner/v1"
-  forwarding_product_path: "google/cloud/websecurityscanner"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4186,7 +4051,6 @@ service {
 service {
   service_proto_path: "google/cloud/workflows/v1/workflows.proto"
   product_path: "google/cloud/workflows/v1"
-  forwarding_product_path: "google/cloud/workflows"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
@@ -4194,7 +4058,6 @@ service {
 service {
   service_proto_path: "google/cloud/workflows/executions/v1/executions.proto"
   product_path: "google/cloud/workflows/executions/v1"
-  forwarding_product_path: "google/cloud/workflows"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }
diff --git a/generator/google_cloud_cpp_generator.bzl b/generator/google_cloud_cpp_generator.bzl
index 29f7a3c9dbe36..9a20c262e612e 100644
--- a/generator/google_cloud_cpp_generator.bzl
+++ b/generator/google_cloud_cpp_generator.bzl
@@ -35,11 +35,6 @@ google_cloud_cpp_generator_hdrs = [
     "internal/doxygen.h",
     "internal/format_class_comments.h",
     "internal/format_method_comments.h",
-    "internal/forwarding_client_generator.h",
-    "internal/forwarding_connection_generator.h",
-    "internal/forwarding_idempotency_policy_generator.h",
-    "internal/forwarding_mock_connection_generator.h",
-    "internal/forwarding_options_generator.h",
     "internal/generator_interface.h",
     "internal/http_annotation_parser.h",
     "internal/http_option_utils.h",
@@ -95,11 +90,6 @@ google_cloud_cpp_generator_srcs = [
     "internal/doxygen.cc",
     "internal/format_class_comments.cc",
     "internal/format_method_comments.cc",
-    "internal/forwarding_client_generator.cc",
-    "internal/forwarding_connection_generator.cc",
-    "internal/forwarding_idempotency_policy_generator.cc",
-    "internal/forwarding_mock_connection_generator.cc",
-    "internal/forwarding_options_generator.cc",
     "internal/http_annotation_parser.cc",
     "internal/http_option_utils.cc",
     "internal/idempotency_policy_generator.cc",
diff --git a/generator/integration_tests/BUILD.bazel b/generator/integration_tests/BUILD.bazel
index 813e330609502..89d521759ee43 100644
--- a/generator/integration_tests/BUILD.bazel
+++ b/generator/integration_tests/BUILD.bazel
@@ -77,8 +77,6 @@ filegroup(
     name = "golden_hdrs",
     srcs = glob(
         include = [
-            "golden/*.h",
-            "golden/mocks/*.h",
             "golden/v1/*.cc",
             "golden/v1/*.h",
             "golden/v1/internal/*.cc",
diff --git a/generator/integration_tests/CMakeLists.txt b/generator/integration_tests/CMakeLists.txt
index 11169e24a3435..fb3fdd6ee7ec4 100644
--- a/generator/integration_tests/CMakeLists.txt
+++ b/generator/integration_tests/CMakeLists.txt
@@ -54,13 +54,8 @@ set_target_properties(google_cloud_cpp_generator_golden_protos
 file(
     GLOB google_cloud_cpp_generator_golden_files
     RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-    "golden/*.h"
-    "golden/mocks/*.h"
-    "golden/v1/*.h"
-    "golden/v1/internal/*.h"
-    "golden/v1/internal/*_sources.cc"
-    "golden/v1/internal/streaming.cc"
-    "golden/v1/mocks/*.h")
+    "golden/v1/*.h" "golden/v1/internal/*.h" "golden/v1/internal/*_sources.cc"
+    "golden/v1/internal/streaming.cc" "golden/v1/mocks/*.h")
 list(SORT google_cloud_cpp_generator_golden_files)
 
 # Create a library from the where the golden code was copied to.
diff --git a/generator/integration_tests/golden/golden_kitchen_sink_client.h b/generator/integration_tests/golden/golden_kitchen_sink_client.h
deleted file mode 100644
index d56d725dd1ef2..0000000000000
--- a/generator/integration_tests/golden/golden_kitchen_sink_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CLIENT_H
-
-#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h"
-#include "generator/integration_tests/golden/v1/golden_kitchen_sink_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in golden_v1 instead of the aliases defined in
-///     this namespace.
-namespace golden {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkClient directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CLIENT_H
diff --git a/generator/integration_tests/golden/golden_kitchen_sink_connection.h b/generator/integration_tests/golden/golden_kitchen_sink_connection.h
deleted file mode 100644
index fadd800f282a5..0000000000000
--- a/generator/integration_tests/golden/golden_kitchen_sink_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H
-
-#include "generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h"
-#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
-
-namespace google {
-namespace cloud {
-namespace golden {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1::MakeGoldenKitchenSinkConnection directly.
-using ::google::cloud::golden_v1::MakeGoldenKitchenSinkConnection;
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkConnection directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkConnection;
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkLimitedTimeRetryPolicy directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkLimitedTimeRetryPolicy;
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkRetryPolicy directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H
diff --git a/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h b/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h
deleted file mode 100644
index 9917eabc4d73e..0000000000000
--- a/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace golden {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1::MakeDefaultGoldenKitchenSinkConnectionIdempotencyPolicy directly.
-using ::google::cloud::golden_v1::MakeDefaultGoldenKitchenSinkConnectionIdempotencyPolicy;
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkConnectionIdempotencyPolicy directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/generator/integration_tests/golden/golden_kitchen_sink_options.h b/generator/integration_tests/golden/golden_kitchen_sink_options.h
deleted file mode 100644
index d341c6a472e8e..0000000000000
--- a/generator/integration_tests/golden/golden_kitchen_sink_options.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_OPTIONS_H
-
-#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h"
-#include "generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h"
-#include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h"
-
-namespace google {
-namespace cloud {
-namespace golden {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkBackoffPolicyOption directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkBackoffPolicyOption;
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkPolicyOptionList directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkPolicyOptionList;
-
-/// @deprecated Use golden_v1::GoldenKitchenSinkRetryPolicyOption directly.
-using ::google::cloud::golden_v1::GoldenKitchenSinkRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_OPTIONS_H
diff --git a/generator/integration_tests/golden/golden_thing_admin_client.h b/generator/integration_tests/golden/golden_thing_admin_client.h
deleted file mode 100644
index f6a025d2c33a8..0000000000000
--- a/generator/integration_tests/golden/golden_thing_admin_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CLIENT_H
-
-#include "generator/integration_tests/golden/golden_thing_admin_connection.h"
-#include "generator/integration_tests/golden/v1/golden_thing_admin_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in golden_v1 instead of the aliases defined in
-///     this namespace.
-namespace golden {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1::GoldenThingAdminClient directly.
-using ::google::cloud::golden_v1::GoldenThingAdminClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CLIENT_H
diff --git a/generator/integration_tests/golden/golden_thing_admin_connection.h b/generator/integration_tests/golden/golden_thing_admin_connection.h
deleted file mode 100644
index 1983cc96c8f34..0000000000000
--- a/generator/integration_tests/golden/golden_thing_admin_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_H
-
-#include "generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h"
-#include "generator/integration_tests/golden/v1/golden_thing_admin_connection.h"
-
-namespace google {
-namespace cloud {
-namespace golden {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1::MakeGoldenThingAdminConnection directly.
-using ::google::cloud::golden_v1::MakeGoldenThingAdminConnection;
-
-/// @deprecated Use golden_v1::GoldenThingAdminConnection directly.
-using ::google::cloud::golden_v1::GoldenThingAdminConnection;
-
-/// @deprecated Use golden_v1::GoldenThingAdminLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::golden_v1::GoldenThingAdminLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use golden_v1::GoldenThingAdminLimitedTimeRetryPolicy directly.
-using ::google::cloud::golden_v1::GoldenThingAdminLimitedTimeRetryPolicy;
-
-/// @deprecated Use golden_v1::GoldenThingAdminRetryPolicy directly.
-using ::google::cloud::golden_v1::GoldenThingAdminRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_H
diff --git a/generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h b/generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h
deleted file mode 100644
index af07244991e57..0000000000000
--- a/generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "generator/integration_tests/golden/v1/golden_thing_admin_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace golden {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1::MakeDefaultGoldenThingAdminConnectionIdempotencyPolicy directly.
-using ::google::cloud::golden_v1::MakeDefaultGoldenThingAdminConnectionIdempotencyPolicy;
-
-/// @deprecated Use golden_v1::GoldenThingAdminConnectionIdempotencyPolicy directly.
-using ::google::cloud::golden_v1::GoldenThingAdminConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/generator/integration_tests/golden/golden_thing_admin_options.h b/generator/integration_tests/golden/golden_thing_admin_options.h
deleted file mode 100644
index ae75afd9faff1..0000000000000
--- a/generator/integration_tests/golden/golden_thing_admin_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_OPTIONS_H
-
-#include "generator/integration_tests/golden/golden_thing_admin_connection.h"
-#include "generator/integration_tests/golden/golden_thing_admin_connection_idempotency_policy.h"
-#include "generator/integration_tests/golden/v1/golden_thing_admin_options.h"
-
-namespace google {
-namespace cloud {
-namespace golden {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1::GoldenThingAdminPollingPolicyOption directly.
-using ::google::cloud::golden_v1::GoldenThingAdminPollingPolicyOption;
-
-/// @deprecated Use golden_v1::GoldenThingAdminBackoffPolicyOption directly.
-using ::google::cloud::golden_v1::GoldenThingAdminBackoffPolicyOption;
-
-/// @deprecated Use golden_v1::GoldenThingAdminConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::golden_v1::GoldenThingAdminConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use golden_v1::GoldenThingAdminPolicyOptionList directly.
-using ::google::cloud::golden_v1::GoldenThingAdminPolicyOptionList;
-
-/// @deprecated Use golden_v1::GoldenThingAdminRetryPolicyOption directly.
-using ::google::cloud::golden_v1::GoldenThingAdminRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_THING_ADMIN_OPTIONS_H
diff --git a/generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h b/generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h
deleted file mode 100644
index cdc30e3cc27c5..0000000000000
--- a/generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H
-
-#include "generator/integration_tests/golden/golden_kitchen_sink_connection.h"
-#include "generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in golden_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace golden_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1_mocks::MockGoldenKitchenSinkConnection directly.
-using ::google::cloud::golden_v1_mocks::MockGoldenKitchenSinkConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H
diff --git a/generator/integration_tests/golden/mocks/mock_golden_thing_admin_connection.h b/generator/integration_tests/golden/mocks/mock_golden_thing_admin_connection.h
deleted file mode 100644
index 225acf2a20e79..0000000000000
--- a/generator/integration_tests/golden/mocks/mock_golden_thing_admin_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: generator/integration_tests/test.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_THING_ADMIN_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_THING_ADMIN_CONNECTION_H
-
-#include "generator/integration_tests/golden/golden_thing_admin_connection.h"
-#include "generator/integration_tests/golden/v1/mocks/mock_golden_thing_admin_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in golden_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace golden_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use golden_v1_mocks::MockGoldenThingAdminConnection directly.
-using ::google::cloud::golden_v1_mocks::MockGoldenThingAdminConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_THING_ADMIN_CONNECTION_H
diff --git a/generator/integration_tests/golden_config.textproto b/generator/integration_tests/golden_config.textproto
index f86b49fb27b2d..9ba74a94ccc3e 100644
--- a/generator/integration_tests/golden_config.textproto
+++ b/generator/integration_tests/golden_config.textproto
@@ -40,7 +40,6 @@ service {
   ]
   generate_round_robin_decorator: true
   generate_rest_transport: true
-  forwarding_product_path: "generator/integration_tests/golden"
   idempotency_overrides: [
     {rpc_name: "GoldenThingAdmin.DropDatabase", idempotency: IDEMPOTENT},
     {rpc_name: "GoldenKitchenSink.ListLogs", idempotency: NON_IDEMPOTENT}
diff --git a/generator/integration_tests/tests/forwarding_headers_test.cc b/generator/integration_tests/tests/forwarding_headers_test.cc
deleted file mode 100644
index 937e1a2af7b33..0000000000000
--- a/generator/integration_tests/tests/forwarding_headers_test.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// In order to test backwards compatibility, we only include `golden` headers.
-// We do not include any headers from `golden/v1`.
-#include "generator/integration_tests/golden/golden_kitchen_sink_client.h"
-#include "generator/integration_tests/golden/golden_kitchen_sink_options.h"
-#include "generator/integration_tests/golden/golden_thing_admin_client.h"
-#include "generator/integration_tests/golden/golden_thing_admin_options.h"
-#include "generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h"
-#include "generator/integration_tests/golden/mocks/mock_golden_thing_admin_connection.h"
-#include <gmock/gmock.h>
-#include <memory>
-
-namespace google {
-namespace cloud {
-// In order to test backwards compatibility, we only use types from the `golden`
-// namespace. We do not use any types from `golden_v1` or `golden_v1_mocks`.
-namespace golden {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-namespace {
-
-TEST(ForwardingHeadersTest, BackwardsCompatForGoldenThingAdmin) {
-  std::shared_ptr<GoldenThingAdminRetryPolicy> retry =
-      std::make_shared<GoldenThingAdminLimitedErrorCountRetryPolicy>(5);
-  retry = std::make_shared<GoldenThingAdminLimitedTimeRetryPolicy>(
-      std::chrono::minutes(5));
-  std::shared_ptr<GoldenThingAdminConnectionIdempotencyPolicy> idempotency =
-      MakeDefaultGoldenThingAdminConnectionIdempotencyPolicy();
-
-  auto options =
-      Options{}
-          .set<GoldenThingAdminPollingPolicyOption>(nullptr)
-          .set<GoldenThingAdminBackoffPolicyOption>(nullptr)
-          .set<GoldenThingAdminConnectionIdempotencyPolicyOption>(idempotency)
-          .set<GoldenThingAdminRetryPolicyOption>(retry);
-
-  std::shared_ptr<GoldenThingAdminConnection> conn =
-      std::make_shared<golden_mocks::MockGoldenThingAdminConnection>();
-  GoldenThingAdminClient client(conn, options);
-
-  std::function<std::shared_ptr<GoldenThingAdminConnection>(Options)> f =
-      MakeGoldenThingAdminConnection;
-  EXPECT_TRUE(static_cast<bool>(f));
-}
-
-TEST(ForwardingHeadersTest, BackwardsCompatForGoldenKitchenSink) {
-  std::shared_ptr<GoldenKitchenSinkRetryPolicy> retry =
-      std::make_shared<GoldenKitchenSinkLimitedErrorCountRetryPolicy>(5);
-  retry = std::make_shared<GoldenKitchenSinkLimitedTimeRetryPolicy>(
-      std::chrono::minutes(5));
-  std::shared_ptr<GoldenKitchenSinkConnectionIdempotencyPolicy> idempotency =
-      MakeDefaultGoldenKitchenSinkConnectionIdempotencyPolicy();
-
-  auto options =
-      Options{}
-          .set<GoldenKitchenSinkBackoffPolicyOption>(nullptr)
-          .set<GoldenKitchenSinkConnectionIdempotencyPolicyOption>(idempotency)
-          .set<GoldenKitchenSinkRetryPolicyOption>(retry);
-
-  std::shared_ptr<GoldenKitchenSinkConnection> conn =
-      std::make_shared<golden_mocks::MockGoldenKitchenSinkConnection>();
-  GoldenKitchenSinkClient client(conn, options);
-
-  std::function<std::shared_ptr<GoldenKitchenSinkConnection>(Options)> f =
-      MakeGoldenKitchenSinkConnection;
-  EXPECT_TRUE(static_cast<bool>(f));
-}
-
-}  // namespace
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace golden
-}  // namespace cloud
-}  // namespace google
diff --git a/generator/internal/codegen_utils.cc b/generator/internal/codegen_utils.cc
index ba0fcfd858084..5be555f1918e2 100644
--- a/generator/internal/codegen_utils.cc
+++ b/generator/internal/codegen_utils.cc
@@ -165,16 +165,6 @@ void ProcessArgAdditionalProtoFiles(
                   command_line_args);
 }
 
-void ProcessArgForwardingProductPath(
-    std::vector<std::pair<std::string, std::string>>& command_line_args) {
-  auto path = std::find_if(command_line_args.begin(), command_line_args.end(),
-                           [](std::pair<std::string, std::string> const& p) {
-                             return p.first == "forwarding_product_path";
-                           });
-  if (path == command_line_args.end() || path->second.empty()) return;
-  FormatProductPath(path->second);
-}
-
 void ProcessArgIdempotencyOverride(
     std::vector<std::pair<std::string, std::string>>& command_line_args) {
   ProcessRepeated("idempotency_override", "idempotency_overrides",
@@ -285,7 +275,6 @@ ProcessCommandLineArgs(std::string const& parameters) {
   ProcessArgGenerateAsyncRpc(command_line_args);
   ProcessArgRetryGrpcStatusCode(command_line_args);
   ProcessArgAdditionalProtoFiles(command_line_args);
-  ProcessArgForwardingProductPath(command_line_args);
   ProcessArgIdempotencyOverride(command_line_args);
   ProcessArgServiceNameMapping(command_line_args);
   ProcessArgServiceNameToComment(command_line_args);
diff --git a/generator/internal/codegen_utils_test.cc b/generator/internal/codegen_utils_test.cc
index c2e71ca3be2f0..de160074187a7 100644
--- a/generator/internal/codegen_utils_test.cc
+++ b/generator/internal/codegen_utils_test.cc
@@ -323,15 +323,6 @@ TEST(ProcessCommandLineArgs, ProcessExperimental) {
   EXPECT_THAT(*result, Contains(Pair("experimental", "true")));
 }
 
-TEST(ProcessCommandLineArgs, ProcessArgForwardingProductPath) {
-  auto result = ProcessCommandLineArgs(
-      "product_path=/google/cloud/spanner/v1"
-      ",forwarding_product_path=google/cloud/spanner");
-  ASSERT_THAT(result, IsOk());
-  EXPECT_THAT(*result, Contains(Pair("forwarding_product_path",
-                                     "google/cloud/spanner/")));
-}
-
 TEST(ProcessCommandLineArgs, ProcessServiceNameMapping) {
   auto result = ProcessCommandLineArgs(
       "product_path=google/cloud/pubsub/"
diff --git a/generator/internal/connection_generator.cc b/generator/internal/connection_generator.cc
index 660fda650c8bd..65c34c7f855cf 100644
--- a/generator/internal/connection_generator.cc
+++ b/generator/internal/connection_generator.cc
@@ -495,22 +495,6 @@ future<StatusOr<$response_type$>>
   }
 
   CcCloseNamespaces();
-
-  // TODO(#8234): This is a special case for backwards compatibility of the
-  //     streaming update function.
-  if (vars().at("service_name") == "BigQueryRead") {
-    CcOpenForwardingNamespaces();
-    CcPrint(R"""(
-void BigQueryReadReadRowsStreamingUpdater(
-    google::cloud::bigquery::storage::v1::ReadRowsResponse const& response,
-    google::cloud::bigquery::storage::v1::ReadRowsRequest& request) {
-  return bigquery_storage_v1_internal::BigQueryReadReadRowsStreamingUpdater(response,
-                                                                 request);
-}
-)""");
-    CcCloseNamespaces();
-  }
-
   return {};
 }
 
diff --git a/generator/internal/descriptor_utils_test.cc b/generator/internal/descriptor_utils_test.cc
index 03cbc06fabaca..3726301a8c199 100644
--- a/generator/internal/descriptor_utils_test.cc
+++ b/generator/internal/descriptor_utils_test.cc
@@ -221,43 +221,6 @@ TEST_F(CreateServiceVarsTest, AdditionalGrpcHeaderPathsEmpty) {
   EXPECT_THAT(iter->second, Eq(""));
 }
 
-TEST_F(CreateServiceVarsTest, ForwardingHeaderPaths) {
-  FileDescriptor const* service_file_descriptor =
-      pool_.FindFileByName("google/cloud/frobber/v1/frobber.proto");
-  service_vars_ = CreateServiceVars(
-      *service_file_descriptor->service(0),
-      {std::make_pair("product_path", "google/cloud/frobber/v1/"),
-       std::make_pair("forwarding_product_path", "google/cloud/frobber/")});
-  EXPECT_THAT(
-      service_vars_,
-      AllOf(Contains(Pair("forwarding_client_header_path",
-                          "google/cloud/frobber/frobber_client.h")),
-            Contains(Pair("forwarding_connection_header_path",
-                          "google/cloud/frobber/frobber_connection.h")),
-            Contains(Pair("forwarding_idempotency_policy_header_path",
-                          "google/cloud/frobber/"
-                          "frobber_connection_idempotency_policy.h")),
-            Contains(
-                Pair("forwarding_mock_connection_header_path",
-                     "google/cloud/frobber/mocks/mock_frobber_connection.h")),
-            Contains(Pair("forwarding_options_header_path",
-                          "google/cloud/frobber/frobber_options.h"))));
-  EXPECT_THAT(
-      service_vars_,
-      AllOf(Contains(Pair("client_header_path",
-                          "google/cloud/frobber/v1/frobber_client.h")),
-            Contains(Pair("connection_header_path",
-                          "google/cloud/frobber/v1/frobber_connection.h")),
-            Contains(Pair("idempotency_policy_header_path",
-                          "google/cloud/frobber/v1/"
-                          "frobber_connection_idempotency_policy.h")),
-            Contains(Pair(
-                "mock_connection_header_path",
-                "google/cloud/frobber/v1/mocks/mock_frobber_connection.h")),
-            Contains(Pair("options_header_path",
-                          "google/cloud/frobber/v1/frobber_options.h"))));
-}
-
 TEST_F(CreateServiceVarsTest, MixinProtoHeaderPaths) {
   FileDescriptor const* file =
       pool_.FindFileByName("google/cloud/frobber/v1/frobber.proto");
diff --git a/generator/internal/forwarding_client_generator.cc b/generator/internal/forwarding_client_generator.cc
deleted file mode 100644
index 73bfff5530528..0000000000000
--- a/generator/internal/forwarding_client_generator.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "generator/internal/forwarding_client_generator.h"
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-ForwardingClientGenerator::ForwardingClientGenerator(
-    google::protobuf::ServiceDescriptor const* service_descriptor,
-    VarsDictionary service_vars,
-    std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context,
-    std::vector<MixinMethod> const& mixin_methods)
-    : ServiceCodeGenerator("forwarding_client_header_path", service_descriptor,
-                           std::move(service_vars),
-                           std::move(service_method_vars), context,
-                           mixin_methods) {}
-
-Status ForwardingClientGenerator::GenerateHeader() {
-  HeaderPrint(CopyrightLicenseFileHeader());
-  HeaderPrint(R"""(
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: $proto_file_name$
-
-#ifndef $header_include_guard$
-#define $header_include_guard$
-
-)""");
-
-  // includes
-  HeaderLocalIncludes({
-      vars("forwarding_connection_header_path"),
-      vars("client_header_path"),
-  });
-
-  auto result = HeaderOpenForwardingNamespaces(NamespaceType::kNormal, R"""(
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in $product_namespace$ instead of the aliases defined in
-///     this namespace.)""");
-  if (!result.ok()) return result;
-
-  // forwards
-  HeaderPrint(
-      R"""(
-/// @deprecated Use $product_namespace$::$client_class_name$ directly.
-using ::google::cloud::$product_namespace$::$client_class_name$;
-)""");
-
-  HeaderCloseNamespaces();
-  // close header guard
-  HeaderPrint(R"""(
-#endif  // $header_include_guard$
-)""");
-  return {};
-}
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
diff --git a/generator/internal/forwarding_client_generator.h b/generator/internal/forwarding_client_generator.h
deleted file mode 100644
index 6a348197eda17..0000000000000
--- a/generator/internal/forwarding_client_generator.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_CLIENT_GENERATOR_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_CLIENT_GENERATOR_H
-
-#include "generator/internal/service_code_generator.h"
-#include "google/cloud/status.h"
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <map>
-#include <string>
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-/**
- * Generates the forwarding header file for a Client class for a particular
- * service.
- */
-class ForwardingClientGenerator : public ServiceCodeGenerator {
- public:
-  ForwardingClientGenerator(
-      google::protobuf::ServiceDescriptor const* service_descriptor,
-      VarsDictionary service_vars,
-      std::map<std::string, VarsDictionary> service_method_vars,
-      google::protobuf::compiler::GeneratorContext* context,
-      std::vector<MixinMethod> const& mixin_methods);
-
-  ~ForwardingClientGenerator() override = default;
-
-  ForwardingClientGenerator(ForwardingClientGenerator const&) = delete;
-  ForwardingClientGenerator& operator=(ForwardingClientGenerator const&) =
-      delete;
-  ForwardingClientGenerator(ForwardingClientGenerator&&) = default;
-  ForwardingClientGenerator& operator=(ForwardingClientGenerator&&) = default;
-
- private:
-  Status GenerateHeader() override;
-  Status GenerateCc() override { return Status(); }
-};
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_CLIENT_GENERATOR_H
diff --git a/generator/internal/forwarding_connection_generator.cc b/generator/internal/forwarding_connection_generator.cc
deleted file mode 100644
index 8447ed3dbf0d7..0000000000000
--- a/generator/internal/forwarding_connection_generator.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "generator/internal/forwarding_connection_generator.h"
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-ForwardingConnectionGenerator::ForwardingConnectionGenerator(
-    google::protobuf::ServiceDescriptor const* service_descriptor,
-    VarsDictionary service_vars,
-    std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context,
-    std::vector<MixinMethod> const& mixin_methods)
-    : ServiceCodeGenerator("forwarding_connection_header_path",
-                           service_descriptor, std::move(service_vars),
-                           std::move(service_method_vars), context,
-                           mixin_methods) {}
-
-Status ForwardingConnectionGenerator::GenerateHeader() {
-  HeaderPrint(CopyrightLicenseFileHeader());
-  HeaderPrint(R"""(
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: $proto_file_name$
-
-#ifndef $header_include_guard$
-#define $header_include_guard$
-
-)""");
-
-  // includes
-  HeaderLocalIncludes({
-      vars("forwarding_idempotency_policy_header_path"),
-      vars("connection_header_path"),
-  });
-
-  auto result = HeaderOpenForwardingNamespaces();
-  if (!result.ok()) return result;
-
-  HeaderPrint(
-      R"""(
-/// @deprecated Use $product_namespace$::Make$connection_class_name$ directly.
-using ::google::cloud::$product_namespace$::Make$connection_class_name$;
-
-/// @deprecated Use $product_namespace$::$connection_class_name$ directly.
-using ::google::cloud::$product_namespace$::$connection_class_name$;
-
-/// @deprecated Use $product_namespace$::$limited_error_count_retry_policy_name$ directly.
-using ::google::cloud::$product_namespace$::$limited_error_count_retry_policy_name$;
-
-/// @deprecated Use $product_namespace$::$limited_time_retry_policy_name$ directly.
-using ::google::cloud::$product_namespace$::$limited_time_retry_policy_name$;
-
-/// @deprecated Use $product_namespace$::$retry_policy_name$ directly.
-using ::google::cloud::$product_namespace$::$retry_policy_name$;
-)""");
-
-  // TODO(#8234): This is a special case for backwards compatibility of the
-  //     streaming update function.
-  if (vars().at("service_name") == "BigQueryRead") {
-    // streaming updater functions
-    for (auto const& method : methods()) {
-      HeaderPrintMethod(
-          method,
-          {MethodPattern(
-              {// clang-format off
-     {"\n"
-      "GOOGLE_CLOUD_CPP_DEPRECATED(\n"
-      "    \"applications should not need this.\"\n"
-      "    \" Please file a bug at https://github.com/googleapis/google-cloud-cpp\"\n"
-      "    \" if you do.\")"
-      "void $service_name$$method_name$StreamingUpdater(\n"
-      "    $response_type$ const& response,\n"
-      "    $request_type$& request);\n"}
-       }, IsStreamingRead)},
-               // clang-format on
-          __FILE__, __LINE__);
-    }
-  }
-
-  HeaderCloseNamespaces();
-  // close header guard
-  HeaderPrint(R"""(
-#endif  // $header_include_guard$
-)""");
-  return {};
-}
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
diff --git a/generator/internal/forwarding_connection_generator.h b/generator/internal/forwarding_connection_generator.h
deleted file mode 100644
index 35a82254f4990..0000000000000
--- a/generator/internal/forwarding_connection_generator.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_CONNECTION_GENERATOR_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_CONNECTION_GENERATOR_H
-
-#include "generator/internal/service_code_generator.h"
-#include "google/cloud/status.h"
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <map>
-#include <string>
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-/**
- * Generates the forwarding header file for a Connection class for a particular
- * service.
- */
-class ForwardingConnectionGenerator : public ServiceCodeGenerator {
- public:
-  ForwardingConnectionGenerator(
-      google::protobuf::ServiceDescriptor const* service_descriptor,
-      VarsDictionary service_vars,
-      std::map<std::string, VarsDictionary> service_method_vars,
-      google::protobuf::compiler::GeneratorContext* context,
-      std::vector<MixinMethod> const& mixin_methods);
-
-  ~ForwardingConnectionGenerator() override = default;
-
-  ForwardingConnectionGenerator(ForwardingConnectionGenerator const&) = delete;
-  ForwardingConnectionGenerator& operator=(
-      ForwardingConnectionGenerator const&) = delete;
-  ForwardingConnectionGenerator(ForwardingConnectionGenerator&&) = default;
-  ForwardingConnectionGenerator& operator=(ForwardingConnectionGenerator&&) =
-      default;
-
- private:
-  Status GenerateHeader() override;
-  Status GenerateCc() override { return Status(); }
-};
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_CONNECTION_GENERATOR_H
diff --git a/generator/internal/forwarding_idempotency_policy_generator.cc b/generator/internal/forwarding_idempotency_policy_generator.cc
deleted file mode 100644
index 3fbab6c018141..0000000000000
--- a/generator/internal/forwarding_idempotency_policy_generator.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "generator/internal/forwarding_idempotency_policy_generator.h"
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-ForwardingIdempotencyPolicyGenerator::ForwardingIdempotencyPolicyGenerator(
-    google::protobuf::ServiceDescriptor const* service_descriptor,
-    VarsDictionary service_vars,
-    std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context,
-    std::vector<MixinMethod> const& mixin_methods)
-    : ServiceCodeGenerator("forwarding_idempotency_policy_header_path",
-                           service_descriptor, std::move(service_vars),
-                           std::move(service_method_vars), context,
-                           mixin_methods) {}
-
-Status ForwardingIdempotencyPolicyGenerator::GenerateHeader() {
-  HeaderPrint(CopyrightLicenseFileHeader());
-  HeaderPrint(R"""(
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: $proto_file_name$
-
-#ifndef $header_include_guard$
-#define $header_include_guard$
-
-)""");
-
-  // includes
-  HeaderLocalIncludes({
-      vars("idempotency_policy_header_path"),
-  });
-
-  auto result = HeaderOpenForwardingNamespaces();
-  if (!result.ok()) return result;
-
-  // forwards
-  HeaderPrint(
-      R"""(
-/// @deprecated Use $product_namespace$::MakeDefault$idempotency_class_name$ directly.
-using ::google::cloud::$product_namespace$::MakeDefault$idempotency_class_name$;
-
-/// @deprecated Use $product_namespace$::$idempotency_class_name$ directly.
-using ::google::cloud::$product_namespace$::$idempotency_class_name$;
-)""");
-
-  HeaderCloseNamespaces();
-  // close header guard
-  HeaderPrint(R"""(
-#endif  // $header_include_guard$
-)""");
-  return {};
-}
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
diff --git a/generator/internal/forwarding_idempotency_policy_generator.h b/generator/internal/forwarding_idempotency_policy_generator.h
deleted file mode 100644
index 6411d109ae8eb..0000000000000
--- a/generator/internal/forwarding_idempotency_policy_generator.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_IDEMPOTENCY_POLICY_GENERATOR_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_IDEMPOTENCY_POLICY_GENERATOR_H
-
-#include "generator/internal/service_code_generator.h"
-#include "google/cloud/status.h"
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <map>
-#include <string>
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-/**
- * Generates the forwarding header file for a IdempotencyPolicy class for a
- * particular service.
- */
-class ForwardingIdempotencyPolicyGenerator : public ServiceCodeGenerator {
- public:
-  ForwardingIdempotencyPolicyGenerator(
-      google::protobuf::ServiceDescriptor const* service_descriptor,
-      VarsDictionary service_vars,
-      std::map<std::string, VarsDictionary> service_method_vars,
-      google::protobuf::compiler::GeneratorContext* context,
-      std::vector<MixinMethod> const& mixin_methods);
-
-  ~ForwardingIdempotencyPolicyGenerator() override = default;
-
-  ForwardingIdempotencyPolicyGenerator(
-      ForwardingIdempotencyPolicyGenerator const&) = delete;
-  ForwardingIdempotencyPolicyGenerator& operator=(
-      ForwardingIdempotencyPolicyGenerator const&) = delete;
-  ForwardingIdempotencyPolicyGenerator(ForwardingIdempotencyPolicyGenerator&&) =
-      default;
-  ForwardingIdempotencyPolicyGenerator& operator=(
-      ForwardingIdempotencyPolicyGenerator&&) = default;
-
- private:
-  Status GenerateHeader() override;
-  Status GenerateCc() override { return Status(); }
-};
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_IDEMPOTENCY_POLICY_GENERATOR_H
diff --git a/generator/internal/forwarding_mock_connection_generator.cc b/generator/internal/forwarding_mock_connection_generator.cc
deleted file mode 100644
index 4b8cce6971407..0000000000000
--- a/generator/internal/forwarding_mock_connection_generator.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "generator/internal/forwarding_mock_connection_generator.h"
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-ForwardingMockConnectionGenerator::ForwardingMockConnectionGenerator(
-    google::protobuf::ServiceDescriptor const* service_descriptor,
-    VarsDictionary service_vars,
-    std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context,
-    std::vector<MixinMethod> const& mixin_methods)
-    : ServiceCodeGenerator("forwarding_mock_connection_header_path",
-                           service_descriptor, std::move(service_vars),
-                           std::move(service_method_vars), context,
-                           mixin_methods) {}
-
-Status ForwardingMockConnectionGenerator::GenerateHeader() {
-  HeaderPrint(CopyrightLicenseFileHeader());
-  HeaderPrint(R"""(
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: $proto_file_name$
-
-#ifndef $header_include_guard$
-#define $header_include_guard$
-
-)""");
-
-  // includes
-  HeaderLocalIncludes({
-      vars("mock_connection_header_path"),
-      vars("forwarding_connection_header_path"),
-  });
-
-  auto result = HeaderOpenForwardingNamespaces(NamespaceType::kMocks, R"""(
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in $product_namespace$_mocks instead of the aliases
-///     defined in this namespace.)""");
-  if (!result.ok()) return result;
-
-  HeaderPrint(
-      R"""(
-/// @deprecated Use $product_namespace$_mocks::$mock_connection_class_name$ directly.
-using ::google::cloud::$product_namespace$_mocks::$mock_connection_class_name$;
-)""");
-
-  HeaderCloseNamespaces();
-  // close header guard
-  HeaderPrint(R"""(
-#endif  // $header_include_guard$
-)""");
-  return {};
-}
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
diff --git a/generator/internal/forwarding_mock_connection_generator.h b/generator/internal/forwarding_mock_connection_generator.h
deleted file mode 100644
index 04b01445c3329..0000000000000
--- a/generator/internal/forwarding_mock_connection_generator.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_MOCK_CONNECTION_GENERATOR_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_MOCK_CONNECTION_GENERATOR_H
-
-#include "generator/internal/service_code_generator.h"
-#include "google/cloud/status.h"
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <map>
-#include <string>
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-/**
- * Generates the forwarding header file for a MockConnection class for a
- * particular service.
- */
-class ForwardingMockConnectionGenerator : public ServiceCodeGenerator {
- public:
-  ForwardingMockConnectionGenerator(
-      google::protobuf::ServiceDescriptor const* service_descriptor,
-      VarsDictionary service_vars,
-      std::map<std::string, VarsDictionary> service_method_vars,
-      google::protobuf::compiler::GeneratorContext* context,
-      std::vector<MixinMethod> const& mixin_methods);
-
-  ~ForwardingMockConnectionGenerator() override = default;
-
-  ForwardingMockConnectionGenerator(ForwardingMockConnectionGenerator const&) =
-      delete;
-  ForwardingMockConnectionGenerator& operator=(
-      ForwardingMockConnectionGenerator const&) = delete;
-  ForwardingMockConnectionGenerator(ForwardingMockConnectionGenerator&&) =
-      default;
-  ForwardingMockConnectionGenerator& operator=(
-      ForwardingMockConnectionGenerator&&) = default;
-
- private:
-  Status GenerateHeader() override;
-  Status GenerateCc() override { return Status(); }
-};
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_MOCK_CONNECTION_GENERATOR_H
diff --git a/generator/internal/forwarding_options_generator.cc b/generator/internal/forwarding_options_generator.cc
deleted file mode 100644
index d79882fad809e..0000000000000
--- a/generator/internal/forwarding_options_generator.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "generator/internal/forwarding_options_generator.h"
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-ForwardingOptionsGenerator::ForwardingOptionsGenerator(
-    google::protobuf::ServiceDescriptor const* service_descriptor,
-    VarsDictionary service_vars,
-    std::map<std::string, VarsDictionary> service_method_vars,
-    google::protobuf::compiler::GeneratorContext* context,
-    std::vector<MixinMethod> const& mixin_methods)
-    : ServiceCodeGenerator("forwarding_options_header_path", service_descriptor,
-                           std::move(service_vars),
-                           std::move(service_method_vars), context,
-                           mixin_methods) {}
-
-Status ForwardingOptionsGenerator::GenerateHeader() {
-  HeaderPrint(CopyrightLicenseFileHeader());
-  HeaderPrint(R"""(
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: $proto_file_name$
-
-#ifndef $header_include_guard$
-#define $header_include_guard$
-
-)""");
-
-  // includes
-  HeaderLocalIncludes({
-      vars("forwarding_connection_header_path"),
-      vars("forwarding_idempotency_policy_header_path"),
-      vars("options_header_path"),
-  });
-
-  auto result = HeaderOpenForwardingNamespaces();
-  if (!result.ok()) return result;
-
-  // forwards
-  if (HasLongrunningMethod()) {
-    HeaderPrint(R"""(
-/// @deprecated Use $product_namespace$::$service_name$PollingPolicyOption directly.
-using ::google::cloud::$product_namespace$::$service_name$PollingPolicyOption;
-)""");
-  }
-  HeaderPrint(R"""(
-/// @deprecated Use $product_namespace$::$service_name$BackoffPolicyOption directly.
-using ::google::cloud::$product_namespace$::$service_name$BackoffPolicyOption;
-
-/// @deprecated Use $product_namespace$::$service_name$ConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::$product_namespace$::$service_name$ConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use $product_namespace$::$service_name$PolicyOptionList directly.
-using ::google::cloud::$product_namespace$::$service_name$PolicyOptionList;
-
-/// @deprecated Use $product_namespace$::$service_name$RetryPolicyOption directly.
-using ::google::cloud::$product_namespace$::$service_name$RetryPolicyOption;
-)""");
-
-  HeaderCloseNamespaces();
-  // close header guard
-  HeaderPrint(R"""(
-#endif  // $header_include_guard$
-)""");
-  return {};
-}
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
diff --git a/generator/internal/forwarding_options_generator.h b/generator/internal/forwarding_options_generator.h
deleted file mode 100644
index c2250296c9997..0000000000000
--- a/generator/internal/forwarding_options_generator.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_OPTIONS_GENERATOR_H
-#define GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_OPTIONS_GENERATOR_H
-
-#include "generator/internal/service_code_generator.h"
-#include "google/cloud/status.h"
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <map>
-#include <string>
-
-namespace google {
-namespace cloud {
-namespace generator_internal {
-
-/**
- * Generates the forwarding header file for a Options class for a particular
- * service.
- */
-class ForwardingOptionsGenerator : public ServiceCodeGenerator {
- public:
-  ForwardingOptionsGenerator(
-      google::protobuf::ServiceDescriptor const* service_descriptor,
-      VarsDictionary service_vars,
-      std::map<std::string, VarsDictionary> service_method_vars,
-      google::protobuf::compiler::GeneratorContext* context,
-      std::vector<MixinMethod> const& mixin_methods);
-
-  ~ForwardingOptionsGenerator() override = default;
-
-  ForwardingOptionsGenerator(ForwardingOptionsGenerator const&) = delete;
-  ForwardingOptionsGenerator& operator=(ForwardingOptionsGenerator const&) =
-      delete;
-  ForwardingOptionsGenerator(ForwardingOptionsGenerator&&) = default;
-  ForwardingOptionsGenerator& operator=(ForwardingOptionsGenerator&&) = default;
-
- private:
-  Status GenerateHeader() override;
-  Status GenerateCc() override { return Status(); }
-};
-
-}  // namespace generator_internal
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTERNAL_FORWARDING_OPTIONS_GENERATOR_H
diff --git a/generator/internal/make_generators.cc b/generator/internal/make_generators.cc
index 8594ba8e8051b..6106010436cd3 100644
--- a/generator/internal/make_generators.cc
+++ b/generator/internal/make_generators.cc
@@ -20,11 +20,6 @@
 #include "generator/internal/connection_impl_rest_generator.h"
 #include "generator/internal/connection_rest_generator.h"
 #include "generator/internal/descriptor_utils.h"
-#include "generator/internal/forwarding_client_generator.h"
-#include "generator/internal/forwarding_connection_generator.h"
-#include "generator/internal/forwarding_idempotency_policy_generator.h"
-#include "generator/internal/forwarding_mock_connection_generator.h"
-#include "generator/internal/forwarding_options_generator.h"
 #include "generator/internal/idempotency_policy_generator.h"
 #include "generator/internal/logging_decorator_generator.h"
 #include "generator/internal/logging_decorator_rest_generator.h"
@@ -111,22 +106,6 @@ std::vector<std::unique_ptr<GeneratorInterface>> MakeGenerators(
     code_generators.push_back(std::make_unique<StubFactoryGenerator>(
         service, service_vars, method_vars, context, mixin_methods));
   }
-  auto const forwarding_headers = service_vars.find("forwarding_product_path");
-  if (forwarding_headers != service_vars.end() &&
-      !forwarding_headers->second.empty()) {
-    code_generators.push_back(std::make_unique<ForwardingClientGenerator>(
-        service, service_vars, method_vars, context, mixin_methods));
-    code_generators.push_back(std::make_unique<ForwardingConnectionGenerator>(
-        service, service_vars, method_vars, context, mixin_methods));
-    code_generators.push_back(
-        std::make_unique<ForwardingIdempotencyPolicyGenerator>(
-            service, service_vars, method_vars, context, mixin_methods));
-    code_generators.push_back(
-        std::make_unique<ForwardingMockConnectionGenerator>(
-            service, service_vars, method_vars, context, mixin_methods));
-    code_generators.push_back(std::make_unique<ForwardingOptionsGenerator>(
-        service, service_vars, method_vars, context, mixin_methods));
-  }
 
   if (generate_grpc_transport) {
     code_generators.push_back(std::make_unique<AuthDecoratorGenerator>(
diff --git a/generator/internal/service_code_generator.cc b/generator/internal/service_code_generator.cc
index 3406c11af32a9..8f9f22f226699 100644
--- a/generator/internal/service_code_generator.cc
+++ b/generator/internal/service_code_generator.cc
@@ -315,22 +315,12 @@ Status ServiceCodeGenerator::HeaderOpenNamespaces(NamespaceType ns_type) {
   return OpenNamespaces(header_, ns_type, "product_path");
 }
 
-Status ServiceCodeGenerator::HeaderOpenForwardingNamespaces(
-    NamespaceType ns_type, std::string const& ns_documentation) {
-  return OpenNamespaces(header_, ns_type, "forwarding_product_path",
-                        ns_documentation);
-}
-
 void ServiceCodeGenerator::HeaderCloseNamespaces() { CloseNamespaces(header_); }
 
 Status ServiceCodeGenerator::CcOpenNamespaces(NamespaceType ns_type) {
   return OpenNamespaces(cc_, ns_type, "product_path");
 }
 
-Status ServiceCodeGenerator::CcOpenForwardingNamespaces(NamespaceType ns_type) {
-  return OpenNamespaces(cc_, ns_type, "forwarding_product_path");
-}
-
 void ServiceCodeGenerator::CcCloseNamespaces() { CloseNamespaces(cc_); }
 
 void ServiceCodeGenerator::HeaderPrint(std::string const& text) {
diff --git a/generator/standalone_main.cc b/generator/standalone_main.cc
index f3500761e8f5a..af80d03c3f031 100644
--- a/generator/standalone_main.cc
+++ b/generator/standalone_main.cc
@@ -165,14 +165,6 @@ int WriteInstallDirectories(
     if (!service.omit_connection()) {
       install_directories.push_back("./include/" + product_path + "/mocks");
     }
-    auto const& forwarding_product_path = service.forwarding_product_path();
-    if (!forwarding_product_path.empty()) {
-      install_directories.push_back("./include/" + forwarding_product_path);
-      if (!service.omit_connection()) {
-        install_directories.push_back("./include/" + forwarding_product_path +
-                                      "/mocks");
-      }
-    }
     auto const lib = LibraryName(product_path);
     install_directories.push_back("./lib64/cmake/google_cloud_cpp_" + lib);
     // Note that storage does not have a public-facing mocks library. Only
@@ -329,10 +321,6 @@ std::vector<std::future<google::cloud::Status>> GenerateCodeFromProtos(
     if (service.experimental()) {
       args.emplace_back("--cpp_codegen_opt=experimental=true");
     }
-    if (!service.forwarding_product_path().empty()) {
-      args.emplace_back("--cpp_codegen_opt=forwarding_product_path=" +
-                        service.forwarding_product_path());
-    }
     for (auto const& o : service.idempotency_overrides()) {
       args.emplace_back(absl::StrCat(
           "--cpp_codegen_opt=idempotency_override=", o.rpc_name(), ":",
diff --git a/google/cloud/accessapproval/BUILD.bazel b/google/cloud/accessapproval/BUILD.bazel
index b14de61afab5b..bde1c5ea5b791 100644
--- a/google/cloud/accessapproval/BUILD.bazel
+++ b/google/cloud/accessapproval/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/accessapproval/CMakeLists.txt b/google/cloud/accessapproval/CMakeLists.txt
index ed2dadc4fc1af..3d22ecb1d1483 100644
--- a/google/cloud/accessapproval/CMakeLists.txt
+++ b/google/cloud/accessapproval/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(accessapproval "Access Approval API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(accessapproval_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/accessapproval/access_approval_client.h b/google/cloud/accessapproval/access_approval_client.h
deleted file mode 100644
index 8fd41234aa446..0000000000000
--- a/google/cloud/accessapproval/access_approval_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/accessapproval/v1/accessapproval.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CLIENT_H
-
-#include "google/cloud/accessapproval/access_approval_connection.h"
-#include "google/cloud/accessapproval/v1/access_approval_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in accessapproval_v1 instead of the aliases defined in
-///     this namespace.
-namespace accessapproval {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use accessapproval_v1::AccessApprovalClient directly.
-using ::google::cloud::accessapproval_v1::AccessApprovalClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accessapproval
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CLIENT_H
diff --git a/google/cloud/accessapproval/access_approval_connection.h b/google/cloud/accessapproval/access_approval_connection.h
deleted file mode 100644
index 532e3a404a4ec..0000000000000
--- a/google/cloud/accessapproval/access_approval_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/accessapproval/v1/accessapproval.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CONNECTION_H
-
-#include "google/cloud/accessapproval/access_approval_connection_idempotency_policy.h"
-#include "google/cloud/accessapproval/v1/access_approval_connection.h"
-
-namespace google {
-namespace cloud {
-namespace accessapproval {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use accessapproval_v1::MakeAccessApprovalConnection directly.
-using ::google::cloud::accessapproval_v1::MakeAccessApprovalConnection;
-
-/// @deprecated Use accessapproval_v1::AccessApprovalConnection directly.
-using ::google::cloud::accessapproval_v1::AccessApprovalConnection;
-
-/// @deprecated Use
-/// accessapproval_v1::AccessApprovalLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::accessapproval_v1::
-    AccessApprovalLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use accessapproval_v1::AccessApprovalLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::accessapproval_v1::AccessApprovalLimitedTimeRetryPolicy;
-
-/// @deprecated Use accessapproval_v1::AccessApprovalRetryPolicy directly.
-using ::google::cloud::accessapproval_v1::AccessApprovalRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accessapproval
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CONNECTION_H
diff --git a/google/cloud/accessapproval/access_approval_connection_idempotency_policy.h b/google/cloud/accessapproval/access_approval_connection_idempotency_policy.h
deleted file mode 100644
index d72277c785324..0000000000000
--- a/google/cloud/accessapproval/access_approval_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/accessapproval/v1/accessapproval.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/accessapproval/v1/access_approval_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace accessapproval {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// accessapproval_v1::MakeDefaultAccessApprovalConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::accessapproval_v1::
-    MakeDefaultAccessApprovalConnectionIdempotencyPolicy;
-
-/// @deprecated Use accessapproval_v1::AccessApprovalConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::accessapproval_v1::
-    AccessApprovalConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accessapproval
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/accessapproval/access_approval_options.h b/google/cloud/accessapproval/access_approval_options.h
deleted file mode 100644
index 8393ed07eb985..0000000000000
--- a/google/cloud/accessapproval/access_approval_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/accessapproval/v1/accessapproval.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_OPTIONS_H
-
-#include "google/cloud/accessapproval/access_approval_connection.h"
-#include "google/cloud/accessapproval/access_approval_connection_idempotency_policy.h"
-#include "google/cloud/accessapproval/v1/access_approval_options.h"
-
-namespace google {
-namespace cloud {
-namespace accessapproval {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use accessapproval_v1::AccessApprovalBackoffPolicyOption
-/// directly.
-using ::google::cloud::accessapproval_v1::AccessApprovalBackoffPolicyOption;
-
-/// @deprecated Use
-/// accessapproval_v1::AccessApprovalConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::accessapproval_v1::
-    AccessApprovalConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use accessapproval_v1::AccessApprovalPolicyOptionList directly.
-using ::google::cloud::accessapproval_v1::AccessApprovalPolicyOptionList;
-
-/// @deprecated Use accessapproval_v1::AccessApprovalRetryPolicyOption directly.
-using ::google::cloud::accessapproval_v1::AccessApprovalRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accessapproval
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_ACCESS_APPROVAL_OPTIONS_H
diff --git a/google/cloud/accessapproval/mocks/mock_access_approval_connection.h b/google/cloud/accessapproval/mocks/mock_access_approval_connection.h
deleted file mode 100644
index c9f2f67c63fa1..0000000000000
--- a/google/cloud/accessapproval/mocks/mock_access_approval_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/accessapproval/v1/accessapproval.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_MOCKS_MOCK_ACCESS_APPROVAL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_MOCKS_MOCK_ACCESS_APPROVAL_CONNECTION_H
-
-#include "google/cloud/accessapproval/access_approval_connection.h"
-#include "google/cloud/accessapproval/v1/mocks/mock_access_approval_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in accessapproval_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace accessapproval_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use accessapproval_v1_mocks::MockAccessApprovalConnection
-/// directly.
-using ::google::cloud::accessapproval_v1_mocks::MockAccessApprovalConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accessapproval_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSAPPROVAL_MOCKS_MOCK_ACCESS_APPROVAL_CONNECTION_H
diff --git a/google/cloud/accesscontextmanager/BUILD.bazel b/google/cloud/accesscontextmanager/BUILD.bazel
index 143b23cb8844e..7aa7362445cc5 100644
--- a/google/cloud/accesscontextmanager/BUILD.bazel
+++ b/google/cloud/accesscontextmanager/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/accesscontextmanager/CMakeLists.txt b/google/cloud/accesscontextmanager/CMakeLists.txt
index ed4fb0ca0a228..50e28e53c7f87 100644
--- a/google/cloud/accesscontextmanager/CMakeLists.txt
+++ b/google/cloud/accesscontextmanager/CMakeLists.txt
@@ -17,8 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
-    accesscontextmanager "Access Context Manager API" SERVICE_DIRS "__EMPTY__"
-                                                                   "v1/")
+    accesscontextmanager "Access Context Manager API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(accesscontextmanager_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/accesscontextmanager/access_context_manager_client.h b/google/cloud/accesscontextmanager/access_context_manager_client.h
deleted file mode 100644
index 34d876ce7301f..0000000000000
--- a/google/cloud/accesscontextmanager/access_context_manager_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/identity/accesscontextmanager/v1/access_context_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_CLIENT_H
-
-#include "google/cloud/accesscontextmanager/access_context_manager_connection.h"
-#include "google/cloud/accesscontextmanager/v1/access_context_manager_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in accesscontextmanager_v1 instead of the aliases defined
-///     in this namespace.
-namespace accesscontextmanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use accesscontextmanager_v1::AccessContextManagerClient
-/// directly.
-using ::google::cloud::accesscontextmanager_v1::AccessContextManagerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accesscontextmanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_CLIENT_H
diff --git a/google/cloud/accesscontextmanager/access_context_manager_connection.h b/google/cloud/accesscontextmanager/access_context_manager_connection.h
deleted file mode 100644
index e4e857eaaf5f9..0000000000000
--- a/google/cloud/accesscontextmanager/access_context_manager_connection.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/identity/accesscontextmanager/v1/access_context_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_CONNECTION_H
-
-#include "google/cloud/accesscontextmanager/access_context_manager_connection_idempotency_policy.h"
-#include "google/cloud/accesscontextmanager/v1/access_context_manager_connection.h"
-
-namespace google {
-namespace cloud {
-namespace accesscontextmanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use accesscontextmanager_v1::MakeAccessContextManagerConnection
-/// directly.
-using ::google::cloud::accesscontextmanager_v1::
-    MakeAccessContextManagerConnection;
-
-/// @deprecated Use accesscontextmanager_v1::AccessContextManagerConnection
-/// directly.
-using ::google::cloud::accesscontextmanager_v1::AccessContextManagerConnection;
-
-/// @deprecated Use
-/// accesscontextmanager_v1::AccessContextManagerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::accesscontextmanager_v1::
-    AccessContextManagerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// accesscontextmanager_v1::AccessContextManagerLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::accesscontextmanager_v1::
-    AccessContextManagerLimitedTimeRetryPolicy;
-
-/// @deprecated Use accesscontextmanager_v1::AccessContextManagerRetryPolicy
-/// directly.
-using ::google::cloud::accesscontextmanager_v1::AccessContextManagerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accesscontextmanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_CONNECTION_H
diff --git a/google/cloud/accesscontextmanager/access_context_manager_connection_idempotency_policy.h b/google/cloud/accesscontextmanager/access_context_manager_connection_idempotency_policy.h
deleted file mode 100644
index 537c22d95d5d6..0000000000000
--- a/google/cloud/accesscontextmanager/access_context_manager_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/identity/accesscontextmanager/v1/access_context_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/accesscontextmanager/v1/access_context_manager_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace accesscontextmanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// accesscontextmanager_v1::MakeDefaultAccessContextManagerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::accesscontextmanager_v1::
-    MakeDefaultAccessContextManagerConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// accesscontextmanager_v1::AccessContextManagerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::accesscontextmanager_v1::
-    AccessContextManagerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accesscontextmanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/accesscontextmanager/access_context_manager_options.h b/google/cloud/accesscontextmanager/access_context_manager_options.h
deleted file mode 100644
index ce05c2fc804c2..0000000000000
--- a/google/cloud/accesscontextmanager/access_context_manager_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/identity/accesscontextmanager/v1/access_context_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_OPTIONS_H
-
-#include "google/cloud/accesscontextmanager/access_context_manager_connection.h"
-#include "google/cloud/accesscontextmanager/access_context_manager_connection_idempotency_policy.h"
-#include "google/cloud/accesscontextmanager/v1/access_context_manager_options.h"
-
-namespace google {
-namespace cloud {
-namespace accesscontextmanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// accesscontextmanager_v1::AccessContextManagerPollingPolicyOption directly.
-using ::google::cloud::accesscontextmanager_v1::
-    AccessContextManagerPollingPolicyOption;
-
-/// @deprecated Use
-/// accesscontextmanager_v1::AccessContextManagerBackoffPolicyOption directly.
-using ::google::cloud::accesscontextmanager_v1::
-    AccessContextManagerBackoffPolicyOption;
-
-/// @deprecated Use
-/// accesscontextmanager_v1::AccessContextManagerConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::accesscontextmanager_v1::
-    AccessContextManagerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// accesscontextmanager_v1::AccessContextManagerPolicyOptionList directly.
-using ::google::cloud::accesscontextmanager_v1::
-    AccessContextManagerPolicyOptionList;
-
-/// @deprecated Use
-/// accesscontextmanager_v1::AccessContextManagerRetryPolicyOption directly.
-using ::google::cloud::accesscontextmanager_v1::
-    AccessContextManagerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accesscontextmanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_ACCESS_CONTEXT_MANAGER_OPTIONS_H
diff --git a/google/cloud/accesscontextmanager/mocks/mock_access_context_manager_connection.h b/google/cloud/accesscontextmanager/mocks/mock_access_context_manager_connection.h
deleted file mode 100644
index 1d1b70fbf3f64..0000000000000
--- a/google/cloud/accesscontextmanager/mocks/mock_access_context_manager_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/identity/accesscontextmanager/v1/access_context_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_MOCKS_MOCK_ACCESS_CONTEXT_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_MOCKS_MOCK_ACCESS_CONTEXT_MANAGER_CONNECTION_H
-
-#include "google/cloud/accesscontextmanager/access_context_manager_connection.h"
-#include "google/cloud/accesscontextmanager/v1/mocks/mock_access_context_manager_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in accesscontextmanager_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace accesscontextmanager_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// accesscontextmanager_v1_mocks::MockAccessContextManagerConnection directly.
-using ::google::cloud::accesscontextmanager_v1_mocks::
-    MockAccessContextManagerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace accesscontextmanager_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ACCESSCONTEXTMANAGER_MOCKS_MOCK_ACCESS_CONTEXT_MANAGER_CONNECTION_H
diff --git a/google/cloud/apigateway/BUILD.bazel b/google/cloud/apigateway/BUILD.bazel
index 7b34a88dd50fd..28d101db96038 100644
--- a/google/cloud/apigateway/BUILD.bazel
+++ b/google/cloud/apigateway/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/apigateway/CMakeLists.txt b/google/cloud/apigateway/CMakeLists.txt
index f8716f3925908..44a49c3102bbd 100644
--- a/google/cloud/apigateway/CMakeLists.txt
+++ b/google/cloud/apigateway/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(apigateway "API Gateway API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(apigateway_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/apigateway/api_gateway_client.h b/google/cloud/apigateway/api_gateway_client.h
deleted file mode 100644
index 11682e568526f..0000000000000
--- a/google/cloud/apigateway/api_gateway_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigateway/v1/apigateway_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_CLIENT_H
-
-#include "google/cloud/apigateway/api_gateway_connection.h"
-#include "google/cloud/apigateway/v1/api_gateway_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in apigateway_v1 instead of the aliases defined in
-///     this namespace.
-namespace apigateway {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apigateway_v1::ApiGatewayServiceClient directly.
-using ::google::cloud::apigateway_v1::ApiGatewayServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigateway
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_CLIENT_H
diff --git a/google/cloud/apigateway/api_gateway_connection.h b/google/cloud/apigateway/api_gateway_connection.h
deleted file mode 100644
index 443ca07c15bc9..0000000000000
--- a/google/cloud/apigateway/api_gateway_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigateway/v1/apigateway_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_CONNECTION_H
-
-#include "google/cloud/apigateway/api_gateway_connection_idempotency_policy.h"
-#include "google/cloud/apigateway/v1/api_gateway_connection.h"
-
-namespace google {
-namespace cloud {
-namespace apigateway {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apigateway_v1::MakeApiGatewayServiceConnection directly.
-using ::google::cloud::apigateway_v1::MakeApiGatewayServiceConnection;
-
-/// @deprecated Use apigateway_v1::ApiGatewayServiceConnection directly.
-using ::google::cloud::apigateway_v1::ApiGatewayServiceConnection;
-
-/// @deprecated Use apigateway_v1::ApiGatewayServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::apigateway_v1::
-    ApiGatewayServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use apigateway_v1::ApiGatewayServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::apigateway_v1::ApiGatewayServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use apigateway_v1::ApiGatewayServiceRetryPolicy directly.
-using ::google::cloud::apigateway_v1::ApiGatewayServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigateway
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_CONNECTION_H
diff --git a/google/cloud/apigateway/api_gateway_connection_idempotency_policy.h b/google/cloud/apigateway/api_gateway_connection_idempotency_policy.h
deleted file mode 100644
index fb27239b47976..0000000000000
--- a/google/cloud/apigateway/api_gateway_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigateway/v1/apigateway_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/apigateway/v1/api_gateway_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace apigateway {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// apigateway_v1::MakeDefaultApiGatewayServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::apigateway_v1::
-    MakeDefaultApiGatewayServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use apigateway_v1::ApiGatewayServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::apigateway_v1::
-    ApiGatewayServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigateway
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/apigateway/api_gateway_options.h b/google/cloud/apigateway/api_gateway_options.h
deleted file mode 100644
index 1d45ecba0b52e..0000000000000
--- a/google/cloud/apigateway/api_gateway_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigateway/v1/apigateway_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_OPTIONS_H
-
-#include "google/cloud/apigateway/api_gateway_connection.h"
-#include "google/cloud/apigateway/api_gateway_connection_idempotency_policy.h"
-#include "google/cloud/apigateway/v1/api_gateway_options.h"
-
-namespace google {
-namespace cloud {
-namespace apigateway {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apigateway_v1::ApiGatewayServicePollingPolicyOption
-/// directly.
-using ::google::cloud::apigateway_v1::ApiGatewayServicePollingPolicyOption;
-
-/// @deprecated Use apigateway_v1::ApiGatewayServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::apigateway_v1::ApiGatewayServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// apigateway_v1::ApiGatewayServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::apigateway_v1::
-    ApiGatewayServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use apigateway_v1::ApiGatewayServicePolicyOptionList directly.
-using ::google::cloud::apigateway_v1::ApiGatewayServicePolicyOptionList;
-
-/// @deprecated Use apigateway_v1::ApiGatewayServiceRetryPolicyOption directly.
-using ::google::cloud::apigateway_v1::ApiGatewayServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigateway
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_API_GATEWAY_OPTIONS_H
diff --git a/google/cloud/apigateway/mocks/mock_api_gateway_connection.h b/google/cloud/apigateway/mocks/mock_api_gateway_connection.h
deleted file mode 100644
index e8fa59547c057..0000000000000
--- a/google/cloud/apigateway/mocks/mock_api_gateway_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigateway/v1/apigateway_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_MOCKS_MOCK_API_GATEWAY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_MOCKS_MOCK_API_GATEWAY_CONNECTION_H
-
-#include "google/cloud/apigateway/api_gateway_connection.h"
-#include "google/cloud/apigateway/v1/mocks/mock_api_gateway_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in apigateway_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace apigateway_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apigateway_v1_mocks::MockApiGatewayServiceConnection
-/// directly.
-using ::google::cloud::apigateway_v1_mocks::MockApiGatewayServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigateway_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGATEWAY_MOCKS_MOCK_API_GATEWAY_CONNECTION_H
diff --git a/google/cloud/apigeeconnect/BUILD.bazel b/google/cloud/apigeeconnect/BUILD.bazel
index c274e55b3bd79..6d3b46405035e 100644
--- a/google/cloud/apigeeconnect/BUILD.bazel
+++ b/google/cloud/apigeeconnect/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/apigeeconnect/CMakeLists.txt b/google/cloud/apigeeconnect/CMakeLists.txt
index 1cd0bd5580905..5f0260ac1f1ec 100644
--- a/google/cloud/apigeeconnect/CMakeLists.txt
+++ b/google/cloud/apigeeconnect/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(apigeeconnect "Apigee Connect API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(apigeeconnect_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/apigeeconnect/connection_client.h b/google/cloud/apigeeconnect/connection_client.h
deleted file mode 100644
index 06f649bb13415..0000000000000
--- a/google/cloud/apigeeconnect/connection_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigeeconnect/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_CLIENT_H
-
-#include "google/cloud/apigeeconnect/connection_connection.h"
-#include "google/cloud/apigeeconnect/v1/connection_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in apigeeconnect_v1 instead of the aliases defined in
-///     this namespace.
-namespace apigeeconnect {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apigeeconnect_v1::ConnectionServiceClient directly.
-using ::google::cloud::apigeeconnect_v1::ConnectionServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigeeconnect
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_CLIENT_H
diff --git a/google/cloud/apigeeconnect/connection_connection.h b/google/cloud/apigeeconnect/connection_connection.h
deleted file mode 100644
index faf53eff5cc35..0000000000000
--- a/google/cloud/apigeeconnect/connection_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigeeconnect/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_CONNECTION_H
-
-#include "google/cloud/apigeeconnect/connection_connection_idempotency_policy.h"
-#include "google/cloud/apigeeconnect/v1/connection_connection.h"
-
-namespace google {
-namespace cloud {
-namespace apigeeconnect {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apigeeconnect_v1::MakeConnectionServiceConnection directly.
-using ::google::cloud::apigeeconnect_v1::MakeConnectionServiceConnection;
-
-/// @deprecated Use apigeeconnect_v1::ConnectionServiceConnection directly.
-using ::google::cloud::apigeeconnect_v1::ConnectionServiceConnection;
-
-/// @deprecated Use
-/// apigeeconnect_v1::ConnectionServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::apigeeconnect_v1::
-    ConnectionServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use apigeeconnect_v1::ConnectionServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::apigeeconnect_v1::
-    ConnectionServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use apigeeconnect_v1::ConnectionServiceRetryPolicy directly.
-using ::google::cloud::apigeeconnect_v1::ConnectionServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigeeconnect
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_CONNECTION_H
diff --git a/google/cloud/apigeeconnect/connection_connection_idempotency_policy.h b/google/cloud/apigeeconnect/connection_connection_idempotency_policy.h
deleted file mode 100644
index 95089111aedf2..0000000000000
--- a/google/cloud/apigeeconnect/connection_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigeeconnect/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/apigeeconnect/v1/connection_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace apigeeconnect {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// apigeeconnect_v1::MakeDefaultConnectionServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::apigeeconnect_v1::
-    MakeDefaultConnectionServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// apigeeconnect_v1::ConnectionServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::apigeeconnect_v1::
-    ConnectionServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigeeconnect
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/apigeeconnect/connection_options.h b/google/cloud/apigeeconnect/connection_options.h
deleted file mode 100644
index 1b39a2d29fab4..0000000000000
--- a/google/cloud/apigeeconnect/connection_options.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigeeconnect/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_OPTIONS_H
-
-#include "google/cloud/apigeeconnect/connection_connection.h"
-#include "google/cloud/apigeeconnect/connection_connection_idempotency_policy.h"
-#include "google/cloud/apigeeconnect/v1/connection_options.h"
-
-namespace google {
-namespace cloud {
-namespace apigeeconnect {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apigeeconnect_v1::ConnectionServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::apigeeconnect_v1::ConnectionServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// apigeeconnect_v1::ConnectionServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::apigeeconnect_v1::
-    ConnectionServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use apigeeconnect_v1::ConnectionServicePolicyOptionList
-/// directly.
-using ::google::cloud::apigeeconnect_v1::ConnectionServicePolicyOptionList;
-
-/// @deprecated Use apigeeconnect_v1::ConnectionServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::apigeeconnect_v1::ConnectionServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigeeconnect
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_CONNECTION_OPTIONS_H
diff --git a/google/cloud/apigeeconnect/mocks/mock_connection_connection.h b/google/cloud/apigeeconnect/mocks/mock_connection_connection.h
deleted file mode 100644
index 97a554a229806..0000000000000
--- a/google/cloud/apigeeconnect/mocks/mock_connection_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/apigeeconnect/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_MOCKS_MOCK_CONNECTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_MOCKS_MOCK_CONNECTION_CONNECTION_H
-
-#include "google/cloud/apigeeconnect/connection_connection.h"
-#include "google/cloud/apigeeconnect/v1/mocks/mock_connection_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in apigeeconnect_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace apigeeconnect_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apigeeconnect_v1_mocks::MockConnectionServiceConnection
-/// directly.
-using ::google::cloud::apigeeconnect_v1_mocks::MockConnectionServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apigeeconnect_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIGEECONNECT_MOCKS_MOCK_CONNECTION_CONNECTION_H
diff --git a/google/cloud/apikeys/BUILD.bazel b/google/cloud/apikeys/BUILD.bazel
index 1be25cbf1ae44..77c3f7bbfbefa 100644
--- a/google/cloud/apikeys/BUILD.bazel
+++ b/google/cloud/apikeys/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v2/",
 ]
 
diff --git a/google/cloud/apikeys/CMakeLists.txt b/google/cloud/apikeys/CMakeLists.txt
index a3f8fed13c9d9..538a9db2255b1 100644
--- a/google/cloud/apikeys/CMakeLists.txt
+++ b/google/cloud/apikeys/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(apikeys "API Keys API"
-                                   SERVICE_DIRS "__EMPTY__" "v2/")
+google_cloud_cpp_add_gapic_library(apikeys "API Keys API" SERVICE_DIRS "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(apikeys_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/apikeys/api_keys_client.h b/google/cloud/apikeys/api_keys_client.h
deleted file mode 100644
index 08676a2051b37..0000000000000
--- a/google/cloud/apikeys/api_keys_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/apikeys/v2/apikeys.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_CLIENT_H
-
-#include "google/cloud/apikeys/api_keys_connection.h"
-#include "google/cloud/apikeys/v2/api_keys_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in apikeys_v2 instead of the aliases defined in
-///     this namespace.
-namespace apikeys {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apikeys_v2::ApiKeysClient directly.
-using ::google::cloud::apikeys_v2::ApiKeysClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apikeys
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_CLIENT_H
diff --git a/google/cloud/apikeys/api_keys_connection.h b/google/cloud/apikeys/api_keys_connection.h
deleted file mode 100644
index 638f0d4ffc0d7..0000000000000
--- a/google/cloud/apikeys/api_keys_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/apikeys/v2/apikeys.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_CONNECTION_H
-
-#include "google/cloud/apikeys/api_keys_connection_idempotency_policy.h"
-#include "google/cloud/apikeys/v2/api_keys_connection.h"
-
-namespace google {
-namespace cloud {
-namespace apikeys {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apikeys_v2::MakeApiKeysConnection directly.
-using ::google::cloud::apikeys_v2::MakeApiKeysConnection;
-
-/// @deprecated Use apikeys_v2::ApiKeysConnection directly.
-using ::google::cloud::apikeys_v2::ApiKeysConnection;
-
-/// @deprecated Use apikeys_v2::ApiKeysLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::apikeys_v2::ApiKeysLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use apikeys_v2::ApiKeysLimitedTimeRetryPolicy directly.
-using ::google::cloud::apikeys_v2::ApiKeysLimitedTimeRetryPolicy;
-
-/// @deprecated Use apikeys_v2::ApiKeysRetryPolicy directly.
-using ::google::cloud::apikeys_v2::ApiKeysRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apikeys
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_CONNECTION_H
diff --git a/google/cloud/apikeys/api_keys_connection_idempotency_policy.h b/google/cloud/apikeys/api_keys_connection_idempotency_policy.h
deleted file mode 100644
index 7edf168469e3e..0000000000000
--- a/google/cloud/apikeys/api_keys_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/apikeys/v2/apikeys.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/apikeys/v2/api_keys_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace apikeys {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apikeys_v2::MakeDefaultApiKeysConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::apikeys_v2::
-    MakeDefaultApiKeysConnectionIdempotencyPolicy;
-
-/// @deprecated Use apikeys_v2::ApiKeysConnectionIdempotencyPolicy directly.
-using ::google::cloud::apikeys_v2::ApiKeysConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apikeys
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/apikeys/api_keys_options.h b/google/cloud/apikeys/api_keys_options.h
deleted file mode 100644
index 15775fe00eb88..0000000000000
--- a/google/cloud/apikeys/api_keys_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/apikeys/v2/apikeys.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_OPTIONS_H
-
-#include "google/cloud/apikeys/api_keys_connection.h"
-#include "google/cloud/apikeys/api_keys_connection_idempotency_policy.h"
-#include "google/cloud/apikeys/v2/api_keys_options.h"
-
-namespace google {
-namespace cloud {
-namespace apikeys {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apikeys_v2::ApiKeysPollingPolicyOption directly.
-using ::google::cloud::apikeys_v2::ApiKeysPollingPolicyOption;
-
-/// @deprecated Use apikeys_v2::ApiKeysBackoffPolicyOption directly.
-using ::google::cloud::apikeys_v2::ApiKeysBackoffPolicyOption;
-
-/// @deprecated Use apikeys_v2::ApiKeysConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::apikeys_v2::ApiKeysConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use apikeys_v2::ApiKeysPolicyOptionList directly.
-using ::google::cloud::apikeys_v2::ApiKeysPolicyOptionList;
-
-/// @deprecated Use apikeys_v2::ApiKeysRetryPolicyOption directly.
-using ::google::cloud::apikeys_v2::ApiKeysRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apikeys
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_API_KEYS_OPTIONS_H
diff --git a/google/cloud/apikeys/mocks/mock_api_keys_connection.h b/google/cloud/apikeys/mocks/mock_api_keys_connection.h
deleted file mode 100644
index 4022a1820decb..0000000000000
--- a/google/cloud/apikeys/mocks/mock_api_keys_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/apikeys/v2/apikeys.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_MOCKS_MOCK_API_KEYS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_MOCKS_MOCK_API_KEYS_CONNECTION_H
-
-#include "google/cloud/apikeys/api_keys_connection.h"
-#include "google/cloud/apikeys/v2/mocks/mock_api_keys_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in apikeys_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace apikeys_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use apikeys_v2_mocks::MockApiKeysConnection directly.
-using ::google::cloud::apikeys_v2_mocks::MockApiKeysConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace apikeys_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APIKEYS_MOCKS_MOCK_API_KEYS_CONNECTION_H
diff --git a/google/cloud/appengine/BUILD.bazel b/google/cloud/appengine/BUILD.bazel
index 7e4deb9427d93..9f5046349c8f7 100644
--- a/google/cloud/appengine/BUILD.bazel
+++ b/google/cloud/appengine/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/appengine/CMakeLists.txt b/google/cloud/appengine/CMakeLists.txt
index 9dee07931b368..a82c639c7b1f2 100644
--- a/google/cloud/appengine/CMakeLists.txt
+++ b/google/cloud/appengine/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     appengine "App Engine Admin API"
-    SERVICE_DIRS "__EMPTY__" "v1/"
+    SERVICE_DIRS "v1/"
     SHARED_PROTO_DEPS "logging_type")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
diff --git a/google/cloud/appengine/applications_client.h b/google/cloud/appengine/applications_client.h
deleted file mode 100644
index 2d4508d7967c4..0000000000000
--- a/google/cloud/appengine/applications_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_CLIENT_H
-
-#include "google/cloud/appengine/applications_connection.h"
-#include "google/cloud/appengine/v1/applications_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1 instead of the aliases defined in
-///     this namespace.
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::ApplicationsClient directly.
-using ::google::cloud::appengine_v1::ApplicationsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_CLIENT_H
diff --git a/google/cloud/appengine/applications_connection.h b/google/cloud/appengine/applications_connection.h
deleted file mode 100644
index 1dcfc5984fb6a..0000000000000
--- a/google/cloud/appengine/applications_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_CONNECTION_H
-
-#include "google/cloud/appengine/applications_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/applications_connection.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeApplicationsConnection directly.
-using ::google::cloud::appengine_v1::MakeApplicationsConnection;
-
-/// @deprecated Use appengine_v1::ApplicationsConnection directly.
-using ::google::cloud::appengine_v1::ApplicationsConnection;
-
-/// @deprecated Use appengine_v1::ApplicationsLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::appengine_v1::ApplicationsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use appengine_v1::ApplicationsLimitedTimeRetryPolicy directly.
-using ::google::cloud::appengine_v1::ApplicationsLimitedTimeRetryPolicy;
-
-/// @deprecated Use appengine_v1::ApplicationsRetryPolicy directly.
-using ::google::cloud::appengine_v1::ApplicationsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_CONNECTION_H
diff --git a/google/cloud/appengine/applications_connection_idempotency_policy.h b/google/cloud/appengine/applications_connection_idempotency_policy.h
deleted file mode 100644
index aa93a19e506cb..0000000000000
--- a/google/cloud/appengine/applications_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/appengine/v1/applications_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// appengine_v1::MakeDefaultApplicationsConnectionIdempotencyPolicy directly.
-using ::google::cloud::appengine_v1::
-    MakeDefaultApplicationsConnectionIdempotencyPolicy;
-
-/// @deprecated Use appengine_v1::ApplicationsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::appengine_v1::ApplicationsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/appengine/applications_options.h b/google/cloud/appengine/applications_options.h
deleted file mode 100644
index 164cf1a04cb6b..0000000000000
--- a/google/cloud/appengine/applications_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_OPTIONS_H
-
-#include "google/cloud/appengine/applications_connection.h"
-#include "google/cloud/appengine/applications_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/applications_options.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::ApplicationsPollingPolicyOption directly.
-using ::google::cloud::appengine_v1::ApplicationsPollingPolicyOption;
-
-/// @deprecated Use appengine_v1::ApplicationsBackoffPolicyOption directly.
-using ::google::cloud::appengine_v1::ApplicationsBackoffPolicyOption;
-
-/// @deprecated Use appengine_v1::ApplicationsConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::appengine_v1::
-    ApplicationsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use appengine_v1::ApplicationsPolicyOptionList directly.
-using ::google::cloud::appengine_v1::ApplicationsPolicyOptionList;
-
-/// @deprecated Use appengine_v1::ApplicationsRetryPolicyOption directly.
-using ::google::cloud::appengine_v1::ApplicationsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_APPLICATIONS_OPTIONS_H
diff --git a/google/cloud/appengine/authorized_certificates_client.h b/google/cloud/appengine/authorized_certificates_client.h
deleted file mode 100644
index 68ffd8bcecaa9..0000000000000
--- a/google/cloud/appengine/authorized_certificates_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_CLIENT_H
-
-#include "google/cloud/appengine/authorized_certificates_connection.h"
-#include "google/cloud/appengine/v1/authorized_certificates_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1 instead of the aliases defined in
-///     this namespace.
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::AuthorizedCertificatesClient directly.
-using ::google::cloud::appengine_v1::AuthorizedCertificatesClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_CLIENT_H
diff --git a/google/cloud/appengine/authorized_certificates_connection.h b/google/cloud/appengine/authorized_certificates_connection.h
deleted file mode 100644
index 29f7c62a37f7e..0000000000000
--- a/google/cloud/appengine/authorized_certificates_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_CONNECTION_H
-
-#include "google/cloud/appengine/authorized_certificates_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/authorized_certificates_connection.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeAuthorizedCertificatesConnection directly.
-using ::google::cloud::appengine_v1::MakeAuthorizedCertificatesConnection;
-
-/// @deprecated Use appengine_v1::AuthorizedCertificatesConnection directly.
-using ::google::cloud::appengine_v1::AuthorizedCertificatesConnection;
-
-/// @deprecated Use
-/// appengine_v1::AuthorizedCertificatesLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::appengine_v1::
-    AuthorizedCertificatesLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use appengine_v1::AuthorizedCertificatesLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::appengine_v1::
-    AuthorizedCertificatesLimitedTimeRetryPolicy;
-
-/// @deprecated Use appengine_v1::AuthorizedCertificatesRetryPolicy directly.
-using ::google::cloud::appengine_v1::AuthorizedCertificatesRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_CONNECTION_H
diff --git a/google/cloud/appengine/authorized_certificates_connection_idempotency_policy.h b/google/cloud/appengine/authorized_certificates_connection_idempotency_policy.h
deleted file mode 100644
index 0787975666c6c..0000000000000
--- a/google/cloud/appengine/authorized_certificates_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/appengine/v1/authorized_certificates_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// appengine_v1::MakeDefaultAuthorizedCertificatesConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::appengine_v1::
-    MakeDefaultAuthorizedCertificatesConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// appengine_v1::AuthorizedCertificatesConnectionIdempotencyPolicy directly.
-using ::google::cloud::appengine_v1::
-    AuthorizedCertificatesConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/appengine/authorized_certificates_options.h b/google/cloud/appengine/authorized_certificates_options.h
deleted file mode 100644
index fa9a8bc820d09..0000000000000
--- a/google/cloud/appengine/authorized_certificates_options.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_OPTIONS_H
-
-#include "google/cloud/appengine/authorized_certificates_connection.h"
-#include "google/cloud/appengine/authorized_certificates_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/authorized_certificates_options.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::AuthorizedCertificatesBackoffPolicyOption
-/// directly.
-using ::google::cloud::appengine_v1::AuthorizedCertificatesBackoffPolicyOption;
-
-/// @deprecated Use
-/// appengine_v1::AuthorizedCertificatesConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::appengine_v1::
-    AuthorizedCertificatesConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use appengine_v1::AuthorizedCertificatesPolicyOptionList
-/// directly.
-using ::google::cloud::appengine_v1::AuthorizedCertificatesPolicyOptionList;
-
-/// @deprecated Use appengine_v1::AuthorizedCertificatesRetryPolicyOption
-/// directly.
-using ::google::cloud::appengine_v1::AuthorizedCertificatesRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_CERTIFICATES_OPTIONS_H
diff --git a/google/cloud/appengine/authorized_domains_client.h b/google/cloud/appengine/authorized_domains_client.h
deleted file mode 100644
index 59ecc60acbab2..0000000000000
--- a/google/cloud/appengine/authorized_domains_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_CLIENT_H
-
-#include "google/cloud/appengine/authorized_domains_connection.h"
-#include "google/cloud/appengine/v1/authorized_domains_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1 instead of the aliases defined in
-///     this namespace.
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::AuthorizedDomainsClient directly.
-using ::google::cloud::appengine_v1::AuthorizedDomainsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_CLIENT_H
diff --git a/google/cloud/appengine/authorized_domains_connection.h b/google/cloud/appengine/authorized_domains_connection.h
deleted file mode 100644
index 2ccc4ea5df5b9..0000000000000
--- a/google/cloud/appengine/authorized_domains_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_CONNECTION_H
-
-#include "google/cloud/appengine/authorized_domains_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/authorized_domains_connection.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeAuthorizedDomainsConnection directly.
-using ::google::cloud::appengine_v1::MakeAuthorizedDomainsConnection;
-
-/// @deprecated Use appengine_v1::AuthorizedDomainsConnection directly.
-using ::google::cloud::appengine_v1::AuthorizedDomainsConnection;
-
-/// @deprecated Use appengine_v1::AuthorizedDomainsLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::appengine_v1::
-    AuthorizedDomainsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use appengine_v1::AuthorizedDomainsLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::appengine_v1::AuthorizedDomainsLimitedTimeRetryPolicy;
-
-/// @deprecated Use appengine_v1::AuthorizedDomainsRetryPolicy directly.
-using ::google::cloud::appengine_v1::AuthorizedDomainsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_CONNECTION_H
diff --git a/google/cloud/appengine/authorized_domains_connection_idempotency_policy.h b/google/cloud/appengine/authorized_domains_connection_idempotency_policy.h
deleted file mode 100644
index e35bec99a5f9c..0000000000000
--- a/google/cloud/appengine/authorized_domains_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/appengine/v1/authorized_domains_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// appengine_v1::MakeDefaultAuthorizedDomainsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::appengine_v1::
-    MakeDefaultAuthorizedDomainsConnectionIdempotencyPolicy;
-
-/// @deprecated Use appengine_v1::AuthorizedDomainsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::appengine_v1::
-    AuthorizedDomainsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/appengine/authorized_domains_options.h b/google/cloud/appengine/authorized_domains_options.h
deleted file mode 100644
index 374ee80ee7548..0000000000000
--- a/google/cloud/appengine/authorized_domains_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_OPTIONS_H
-
-#include "google/cloud/appengine/authorized_domains_connection.h"
-#include "google/cloud/appengine/authorized_domains_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/authorized_domains_options.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::AuthorizedDomainsBackoffPolicyOption directly.
-using ::google::cloud::appengine_v1::AuthorizedDomainsBackoffPolicyOption;
-
-/// @deprecated Use
-/// appengine_v1::AuthorizedDomainsConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::appengine_v1::
-    AuthorizedDomainsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use appengine_v1::AuthorizedDomainsPolicyOptionList directly.
-using ::google::cloud::appengine_v1::AuthorizedDomainsPolicyOptionList;
-
-/// @deprecated Use appengine_v1::AuthorizedDomainsRetryPolicyOption directly.
-using ::google::cloud::appengine_v1::AuthorizedDomainsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_AUTHORIZED_DOMAINS_OPTIONS_H
diff --git a/google/cloud/appengine/domain_mappings_client.h b/google/cloud/appengine/domain_mappings_client.h
deleted file mode 100644
index 21a6dbb2577de..0000000000000
--- a/google/cloud/appengine/domain_mappings_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_CLIENT_H
-
-#include "google/cloud/appengine/domain_mappings_connection.h"
-#include "google/cloud/appengine/v1/domain_mappings_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1 instead of the aliases defined in
-///     this namespace.
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::DomainMappingsClient directly.
-using ::google::cloud::appengine_v1::DomainMappingsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_CLIENT_H
diff --git a/google/cloud/appengine/domain_mappings_connection.h b/google/cloud/appengine/domain_mappings_connection.h
deleted file mode 100644
index cae216f3a7d8c..0000000000000
--- a/google/cloud/appengine/domain_mappings_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_CONNECTION_H
-
-#include "google/cloud/appengine/domain_mappings_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/domain_mappings_connection.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeDomainMappingsConnection directly.
-using ::google::cloud::appengine_v1::MakeDomainMappingsConnection;
-
-/// @deprecated Use appengine_v1::DomainMappingsConnection directly.
-using ::google::cloud::appengine_v1::DomainMappingsConnection;
-
-/// @deprecated Use appengine_v1::DomainMappingsLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::appengine_v1::DomainMappingsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use appengine_v1::DomainMappingsLimitedTimeRetryPolicy directly.
-using ::google::cloud::appengine_v1::DomainMappingsLimitedTimeRetryPolicy;
-
-/// @deprecated Use appengine_v1::DomainMappingsRetryPolicy directly.
-using ::google::cloud::appengine_v1::DomainMappingsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_CONNECTION_H
diff --git a/google/cloud/appengine/domain_mappings_connection_idempotency_policy.h b/google/cloud/appengine/domain_mappings_connection_idempotency_policy.h
deleted file mode 100644
index 3c535df709204..0000000000000
--- a/google/cloud/appengine/domain_mappings_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/appengine/v1/domain_mappings_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// appengine_v1::MakeDefaultDomainMappingsConnectionIdempotencyPolicy directly.
-using ::google::cloud::appengine_v1::
-    MakeDefaultDomainMappingsConnectionIdempotencyPolicy;
-
-/// @deprecated Use appengine_v1::DomainMappingsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::appengine_v1::DomainMappingsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/appengine/domain_mappings_options.h b/google/cloud/appengine/domain_mappings_options.h
deleted file mode 100644
index 24cb092e57566..0000000000000
--- a/google/cloud/appengine/domain_mappings_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_OPTIONS_H
-
-#include "google/cloud/appengine/domain_mappings_connection.h"
-#include "google/cloud/appengine/domain_mappings_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/domain_mappings_options.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::DomainMappingsPollingPolicyOption directly.
-using ::google::cloud::appengine_v1::DomainMappingsPollingPolicyOption;
-
-/// @deprecated Use appengine_v1::DomainMappingsBackoffPolicyOption directly.
-using ::google::cloud::appengine_v1::DomainMappingsBackoffPolicyOption;
-
-/// @deprecated Use
-/// appengine_v1::DomainMappingsConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::appengine_v1::
-    DomainMappingsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use appengine_v1::DomainMappingsPolicyOptionList directly.
-using ::google::cloud::appengine_v1::DomainMappingsPolicyOptionList;
-
-/// @deprecated Use appengine_v1::DomainMappingsRetryPolicyOption directly.
-using ::google::cloud::appengine_v1::DomainMappingsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_DOMAIN_MAPPINGS_OPTIONS_H
diff --git a/google/cloud/appengine/firewall_client.h b/google/cloud/appengine/firewall_client.h
deleted file mode 100644
index bfe06f596d985..0000000000000
--- a/google/cloud/appengine/firewall_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_CLIENT_H
-
-#include "google/cloud/appengine/firewall_connection.h"
-#include "google/cloud/appengine/v1/firewall_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1 instead of the aliases defined in
-///     this namespace.
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::FirewallClient directly.
-using ::google::cloud::appengine_v1::FirewallClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_CLIENT_H
diff --git a/google/cloud/appengine/firewall_connection.h b/google/cloud/appengine/firewall_connection.h
deleted file mode 100644
index 35353d72e8316..0000000000000
--- a/google/cloud/appengine/firewall_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_CONNECTION_H
-
-#include "google/cloud/appengine/firewall_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/firewall_connection.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeFirewallConnection directly.
-using ::google::cloud::appengine_v1::MakeFirewallConnection;
-
-/// @deprecated Use appengine_v1::FirewallConnection directly.
-using ::google::cloud::appengine_v1::FirewallConnection;
-
-/// @deprecated Use appengine_v1::FirewallLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::appengine_v1::FirewallLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use appengine_v1::FirewallLimitedTimeRetryPolicy directly.
-using ::google::cloud::appengine_v1::FirewallLimitedTimeRetryPolicy;
-
-/// @deprecated Use appengine_v1::FirewallRetryPolicy directly.
-using ::google::cloud::appengine_v1::FirewallRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_CONNECTION_H
diff --git a/google/cloud/appengine/firewall_connection_idempotency_policy.h b/google/cloud/appengine/firewall_connection_idempotency_policy.h
deleted file mode 100644
index 1ab1bc3200dea..0000000000000
--- a/google/cloud/appengine/firewall_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/appengine/v1/firewall_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeDefaultFirewallConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::appengine_v1::
-    MakeDefaultFirewallConnectionIdempotencyPolicy;
-
-/// @deprecated Use appengine_v1::FirewallConnectionIdempotencyPolicy directly.
-using ::google::cloud::appengine_v1::FirewallConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/appengine/firewall_options.h b/google/cloud/appengine/firewall_options.h
deleted file mode 100644
index 77fba158950d8..0000000000000
--- a/google/cloud/appengine/firewall_options.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_OPTIONS_H
-
-#include "google/cloud/appengine/firewall_connection.h"
-#include "google/cloud/appengine/firewall_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/firewall_options.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::FirewallBackoffPolicyOption directly.
-using ::google::cloud::appengine_v1::FirewallBackoffPolicyOption;
-
-/// @deprecated Use appengine_v1::FirewallConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::appengine_v1::FirewallConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use appengine_v1::FirewallPolicyOptionList directly.
-using ::google::cloud::appengine_v1::FirewallPolicyOptionList;
-
-/// @deprecated Use appengine_v1::FirewallRetryPolicyOption directly.
-using ::google::cloud::appengine_v1::FirewallRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_FIREWALL_OPTIONS_H
diff --git a/google/cloud/appengine/instances_client.h b/google/cloud/appengine/instances_client.h
deleted file mode 100644
index 4a6dc74b581e8..0000000000000
--- a/google/cloud/appengine/instances_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_CLIENT_H
-
-#include "google/cloud/appengine/instances_connection.h"
-#include "google/cloud/appengine/v1/instances_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1 instead of the aliases defined in
-///     this namespace.
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::InstancesClient directly.
-using ::google::cloud::appengine_v1::InstancesClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_CLIENT_H
diff --git a/google/cloud/appengine/instances_connection.h b/google/cloud/appengine/instances_connection.h
deleted file mode 100644
index 9020f69687cd0..0000000000000
--- a/google/cloud/appengine/instances_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_CONNECTION_H
-
-#include "google/cloud/appengine/instances_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/instances_connection.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeInstancesConnection directly.
-using ::google::cloud::appengine_v1::MakeInstancesConnection;
-
-/// @deprecated Use appengine_v1::InstancesConnection directly.
-using ::google::cloud::appengine_v1::InstancesConnection;
-
-/// @deprecated Use appengine_v1::InstancesLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::appengine_v1::InstancesLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use appengine_v1::InstancesLimitedTimeRetryPolicy directly.
-using ::google::cloud::appengine_v1::InstancesLimitedTimeRetryPolicy;
-
-/// @deprecated Use appengine_v1::InstancesRetryPolicy directly.
-using ::google::cloud::appengine_v1::InstancesRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_CONNECTION_H
diff --git a/google/cloud/appengine/instances_connection_idempotency_policy.h b/google/cloud/appengine/instances_connection_idempotency_policy.h
deleted file mode 100644
index 0c70380c44a3b..0000000000000
--- a/google/cloud/appengine/instances_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/appengine/v1/instances_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// appengine_v1::MakeDefaultInstancesConnectionIdempotencyPolicy directly.
-using ::google::cloud::appengine_v1::
-    MakeDefaultInstancesConnectionIdempotencyPolicy;
-
-/// @deprecated Use appengine_v1::InstancesConnectionIdempotencyPolicy directly.
-using ::google::cloud::appengine_v1::InstancesConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/appengine/instances_options.h b/google/cloud/appengine/instances_options.h
deleted file mode 100644
index a1ef7fb7ee125..0000000000000
--- a/google/cloud/appengine/instances_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_OPTIONS_H
-
-#include "google/cloud/appengine/instances_connection.h"
-#include "google/cloud/appengine/instances_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/instances_options.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::InstancesPollingPolicyOption directly.
-using ::google::cloud::appengine_v1::InstancesPollingPolicyOption;
-
-/// @deprecated Use appengine_v1::InstancesBackoffPolicyOption directly.
-using ::google::cloud::appengine_v1::InstancesBackoffPolicyOption;
-
-/// @deprecated Use appengine_v1::InstancesConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::appengine_v1::InstancesConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use appengine_v1::InstancesPolicyOptionList directly.
-using ::google::cloud::appengine_v1::InstancesPolicyOptionList;
-
-/// @deprecated Use appengine_v1::InstancesRetryPolicyOption directly.
-using ::google::cloud::appengine_v1::InstancesRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_INSTANCES_OPTIONS_H
diff --git a/google/cloud/appengine/mocks/mock_applications_connection.h b/google/cloud/appengine/mocks/mock_applications_connection.h
deleted file mode 100644
index 960b72041b782..0000000000000
--- a/google/cloud/appengine/mocks/mock_applications_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_APPLICATIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_APPLICATIONS_CONNECTION_H
-
-#include "google/cloud/appengine/applications_connection.h"
-#include "google/cloud/appengine/v1/mocks/mock_applications_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace appengine_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1_mocks::MockApplicationsConnection directly.
-using ::google::cloud::appengine_v1_mocks::MockApplicationsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_APPLICATIONS_CONNECTION_H
diff --git a/google/cloud/appengine/mocks/mock_authorized_certificates_connection.h b/google/cloud/appengine/mocks/mock_authorized_certificates_connection.h
deleted file mode 100644
index eac1b064665de..0000000000000
--- a/google/cloud/appengine/mocks/mock_authorized_certificates_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_AUTHORIZED_CERTIFICATES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_AUTHORIZED_CERTIFICATES_CONNECTION_H
-
-#include "google/cloud/appengine/authorized_certificates_connection.h"
-#include "google/cloud/appengine/v1/mocks/mock_authorized_certificates_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace appengine_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1_mocks::MockAuthorizedCertificatesConnection
-/// directly.
-using ::google::cloud::appengine_v1_mocks::MockAuthorizedCertificatesConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_AUTHORIZED_CERTIFICATES_CONNECTION_H
diff --git a/google/cloud/appengine/mocks/mock_authorized_domains_connection.h b/google/cloud/appengine/mocks/mock_authorized_domains_connection.h
deleted file mode 100644
index 1e87e7cbb7087..0000000000000
--- a/google/cloud/appengine/mocks/mock_authorized_domains_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_AUTHORIZED_DOMAINS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_AUTHORIZED_DOMAINS_CONNECTION_H
-
-#include "google/cloud/appengine/authorized_domains_connection.h"
-#include "google/cloud/appengine/v1/mocks/mock_authorized_domains_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace appengine_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1_mocks::MockAuthorizedDomainsConnection
-/// directly.
-using ::google::cloud::appengine_v1_mocks::MockAuthorizedDomainsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_AUTHORIZED_DOMAINS_CONNECTION_H
diff --git a/google/cloud/appengine/mocks/mock_domain_mappings_connection.h b/google/cloud/appengine/mocks/mock_domain_mappings_connection.h
deleted file mode 100644
index af6c1db4426fe..0000000000000
--- a/google/cloud/appengine/mocks/mock_domain_mappings_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_DOMAIN_MAPPINGS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_DOMAIN_MAPPINGS_CONNECTION_H
-
-#include "google/cloud/appengine/domain_mappings_connection.h"
-#include "google/cloud/appengine/v1/mocks/mock_domain_mappings_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace appengine_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1_mocks::MockDomainMappingsConnection directly.
-using ::google::cloud::appengine_v1_mocks::MockDomainMappingsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_DOMAIN_MAPPINGS_CONNECTION_H
diff --git a/google/cloud/appengine/mocks/mock_firewall_connection.h b/google/cloud/appengine/mocks/mock_firewall_connection.h
deleted file mode 100644
index 22fdd5b071b82..0000000000000
--- a/google/cloud/appengine/mocks/mock_firewall_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_FIREWALL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_FIREWALL_CONNECTION_H
-
-#include "google/cloud/appengine/firewall_connection.h"
-#include "google/cloud/appengine/v1/mocks/mock_firewall_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace appengine_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1_mocks::MockFirewallConnection directly.
-using ::google::cloud::appengine_v1_mocks::MockFirewallConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_FIREWALL_CONNECTION_H
diff --git a/google/cloud/appengine/mocks/mock_instances_connection.h b/google/cloud/appengine/mocks/mock_instances_connection.h
deleted file mode 100644
index 5d5de36c446a9..0000000000000
--- a/google/cloud/appengine/mocks/mock_instances_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_INSTANCES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_INSTANCES_CONNECTION_H
-
-#include "google/cloud/appengine/instances_connection.h"
-#include "google/cloud/appengine/v1/mocks/mock_instances_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace appengine_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1_mocks::MockInstancesConnection directly.
-using ::google::cloud::appengine_v1_mocks::MockInstancesConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_INSTANCES_CONNECTION_H
diff --git a/google/cloud/appengine/mocks/mock_services_connection.h b/google/cloud/appengine/mocks/mock_services_connection.h
deleted file mode 100644
index 8ea0a3758fc54..0000000000000
--- a/google/cloud/appengine/mocks/mock_services_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_SERVICES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_SERVICES_CONNECTION_H
-
-#include "google/cloud/appengine/services_connection.h"
-#include "google/cloud/appengine/v1/mocks/mock_services_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace appengine_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1_mocks::MockServicesConnection directly.
-using ::google::cloud::appengine_v1_mocks::MockServicesConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_SERVICES_CONNECTION_H
diff --git a/google/cloud/appengine/mocks/mock_versions_connection.h b/google/cloud/appengine/mocks/mock_versions_connection.h
deleted file mode 100644
index e1d72b5613a95..0000000000000
--- a/google/cloud/appengine/mocks/mock_versions_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_VERSIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_VERSIONS_CONNECTION_H
-
-#include "google/cloud/appengine/v1/mocks/mock_versions_connection.h"
-#include "google/cloud/appengine/versions_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace appengine_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1_mocks::MockVersionsConnection directly.
-using ::google::cloud::appengine_v1_mocks::MockVersionsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_MOCKS_MOCK_VERSIONS_CONNECTION_H
diff --git a/google/cloud/appengine/services_client.h b/google/cloud/appengine/services_client.h
deleted file mode 100644
index c786f15a232bc..0000000000000
--- a/google/cloud/appengine/services_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_CLIENT_H
-
-#include "google/cloud/appengine/services_connection.h"
-#include "google/cloud/appengine/v1/services_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1 instead of the aliases defined in
-///     this namespace.
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::ServicesClient directly.
-using ::google::cloud::appengine_v1::ServicesClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_CLIENT_H
diff --git a/google/cloud/appengine/services_connection.h b/google/cloud/appengine/services_connection.h
deleted file mode 100644
index e35fb5dc203fc..0000000000000
--- a/google/cloud/appengine/services_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_CONNECTION_H
-
-#include "google/cloud/appengine/services_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/services_connection.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeServicesConnection directly.
-using ::google::cloud::appengine_v1::MakeServicesConnection;
-
-/// @deprecated Use appengine_v1::ServicesConnection directly.
-using ::google::cloud::appengine_v1::ServicesConnection;
-
-/// @deprecated Use appengine_v1::ServicesLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::appengine_v1::ServicesLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use appengine_v1::ServicesLimitedTimeRetryPolicy directly.
-using ::google::cloud::appengine_v1::ServicesLimitedTimeRetryPolicy;
-
-/// @deprecated Use appengine_v1::ServicesRetryPolicy directly.
-using ::google::cloud::appengine_v1::ServicesRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_CONNECTION_H
diff --git a/google/cloud/appengine/services_connection_idempotency_policy.h b/google/cloud/appengine/services_connection_idempotency_policy.h
deleted file mode 100644
index 2e8d5895d736b..0000000000000
--- a/google/cloud/appengine/services_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/appengine/v1/services_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeDefaultServicesConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::appengine_v1::
-    MakeDefaultServicesConnectionIdempotencyPolicy;
-
-/// @deprecated Use appengine_v1::ServicesConnectionIdempotencyPolicy directly.
-using ::google::cloud::appengine_v1::ServicesConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/appengine/services_options.h b/google/cloud/appengine/services_options.h
deleted file mode 100644
index e533fdbcb278f..0000000000000
--- a/google/cloud/appengine/services_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_OPTIONS_H
-
-#include "google/cloud/appengine/services_connection.h"
-#include "google/cloud/appengine/services_connection_idempotency_policy.h"
-#include "google/cloud/appengine/v1/services_options.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::ServicesPollingPolicyOption directly.
-using ::google::cloud::appengine_v1::ServicesPollingPolicyOption;
-
-/// @deprecated Use appengine_v1::ServicesBackoffPolicyOption directly.
-using ::google::cloud::appengine_v1::ServicesBackoffPolicyOption;
-
-/// @deprecated Use appengine_v1::ServicesConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::appengine_v1::ServicesConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use appengine_v1::ServicesPolicyOptionList directly.
-using ::google::cloud::appengine_v1::ServicesPolicyOptionList;
-
-/// @deprecated Use appengine_v1::ServicesRetryPolicyOption directly.
-using ::google::cloud::appengine_v1::ServicesRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_SERVICES_OPTIONS_H
diff --git a/google/cloud/appengine/versions_client.h b/google/cloud/appengine/versions_client.h
deleted file mode 100644
index 444c53df2a3bb..0000000000000
--- a/google/cloud/appengine/versions_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_CLIENT_H
-
-#include "google/cloud/appengine/v1/versions_client.h"
-#include "google/cloud/appengine/versions_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in appengine_v1 instead of the aliases defined in
-///     this namespace.
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::VersionsClient directly.
-using ::google::cloud::appengine_v1::VersionsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_CLIENT_H
diff --git a/google/cloud/appengine/versions_connection.h b/google/cloud/appengine/versions_connection.h
deleted file mode 100644
index d91e582a9901b..0000000000000
--- a/google/cloud/appengine/versions_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_CONNECTION_H
-
-#include "google/cloud/appengine/v1/versions_connection.h"
-#include "google/cloud/appengine/versions_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeVersionsConnection directly.
-using ::google::cloud::appengine_v1::MakeVersionsConnection;
-
-/// @deprecated Use appengine_v1::VersionsConnection directly.
-using ::google::cloud::appengine_v1::VersionsConnection;
-
-/// @deprecated Use appengine_v1::VersionsLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::appengine_v1::VersionsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use appengine_v1::VersionsLimitedTimeRetryPolicy directly.
-using ::google::cloud::appengine_v1::VersionsLimitedTimeRetryPolicy;
-
-/// @deprecated Use appengine_v1::VersionsRetryPolicy directly.
-using ::google::cloud::appengine_v1::VersionsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_CONNECTION_H
diff --git a/google/cloud/appengine/versions_connection_idempotency_policy.h b/google/cloud/appengine/versions_connection_idempotency_policy.h
deleted file mode 100644
index f7f65b87f14f7..0000000000000
--- a/google/cloud/appengine/versions_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/appengine/v1/versions_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::MakeDefaultVersionsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::appengine_v1::
-    MakeDefaultVersionsConnectionIdempotencyPolicy;
-
-/// @deprecated Use appengine_v1::VersionsConnectionIdempotencyPolicy directly.
-using ::google::cloud::appengine_v1::VersionsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/appengine/versions_options.h b/google/cloud/appengine/versions_options.h
deleted file mode 100644
index 4add537e75c43..0000000000000
--- a/google/cloud/appengine/versions_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/appengine/v1/appengine.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_OPTIONS_H
-
-#include "google/cloud/appengine/v1/versions_options.h"
-#include "google/cloud/appengine/versions_connection.h"
-#include "google/cloud/appengine/versions_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace appengine {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use appengine_v1::VersionsPollingPolicyOption directly.
-using ::google::cloud::appengine_v1::VersionsPollingPolicyOption;
-
-/// @deprecated Use appengine_v1::VersionsBackoffPolicyOption directly.
-using ::google::cloud::appengine_v1::VersionsBackoffPolicyOption;
-
-/// @deprecated Use appengine_v1::VersionsConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::appengine_v1::VersionsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use appengine_v1::VersionsPolicyOptionList directly.
-using ::google::cloud::appengine_v1::VersionsPolicyOptionList;
-
-/// @deprecated Use appengine_v1::VersionsRetryPolicyOption directly.
-using ::google::cloud::appengine_v1::VersionsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace appengine
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_APPENGINE_VERSIONS_OPTIONS_H
diff --git a/google/cloud/artifactregistry/BUILD.bazel b/google/cloud/artifactregistry/BUILD.bazel
index 696b410646e0d..9c5047fdf4f91 100644
--- a/google/cloud/artifactregistry/BUILD.bazel
+++ b/google/cloud/artifactregistry/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/artifactregistry/CMakeLists.txt b/google/cloud/artifactregistry/CMakeLists.txt
index 4a64078b3e0bd..e72cdb91cd067 100644
--- a/google/cloud/artifactregistry/CMakeLists.txt
+++ b/google/cloud/artifactregistry/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(artifactregistry "Artifact Registry API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(artifactregistry_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/artifactregistry/artifact_registry_client.h b/google/cloud/artifactregistry/artifact_registry_client.h
deleted file mode 100644
index a63dd317061c1..0000000000000
--- a/google/cloud/artifactregistry/artifact_registry_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/artifactregistry/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_CLIENT_H
-
-#include "google/cloud/artifactregistry/artifact_registry_connection.h"
-#include "google/cloud/artifactregistry/v1/artifact_registry_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in artifactregistry_v1 instead of the aliases defined in
-///     this namespace.
-namespace artifactregistry {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use artifactregistry_v1::ArtifactRegistryClient directly.
-using ::google::cloud::artifactregistry_v1::ArtifactRegistryClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace artifactregistry
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_CLIENT_H
diff --git a/google/cloud/artifactregistry/artifact_registry_connection.h b/google/cloud/artifactregistry/artifact_registry_connection.h
deleted file mode 100644
index 079d726ba150c..0000000000000
--- a/google/cloud/artifactregistry/artifact_registry_connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/artifactregistry/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_CONNECTION_H
-
-#include "google/cloud/artifactregistry/artifact_registry_connection_idempotency_policy.h"
-#include "google/cloud/artifactregistry/v1/artifact_registry_connection.h"
-
-namespace google {
-namespace cloud {
-namespace artifactregistry {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use artifactregistry_v1::MakeArtifactRegistryConnection
-/// directly.
-using ::google::cloud::artifactregistry_v1::MakeArtifactRegistryConnection;
-
-/// @deprecated Use artifactregistry_v1::ArtifactRegistryConnection directly.
-using ::google::cloud::artifactregistry_v1::ArtifactRegistryConnection;
-
-/// @deprecated Use
-/// artifactregistry_v1::ArtifactRegistryLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::artifactregistry_v1::
-    ArtifactRegistryLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use artifactregistry_v1::ArtifactRegistryLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::artifactregistry_v1::
-    ArtifactRegistryLimitedTimeRetryPolicy;
-
-/// @deprecated Use artifactregistry_v1::ArtifactRegistryRetryPolicy directly.
-using ::google::cloud::artifactregistry_v1::ArtifactRegistryRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace artifactregistry
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_CONNECTION_H
diff --git a/google/cloud/artifactregistry/artifact_registry_connection_idempotency_policy.h b/google/cloud/artifactregistry/artifact_registry_connection_idempotency_policy.h
deleted file mode 100644
index 2db4d00926e5c..0000000000000
--- a/google/cloud/artifactregistry/artifact_registry_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/artifactregistry/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/artifactregistry/v1/artifact_registry_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace artifactregistry {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// artifactregistry_v1::MakeDefaultArtifactRegistryConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::artifactregistry_v1::
-    MakeDefaultArtifactRegistryConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// artifactregistry_v1::ArtifactRegistryConnectionIdempotencyPolicy directly.
-using ::google::cloud::artifactregistry_v1::
-    ArtifactRegistryConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace artifactregistry
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/artifactregistry/artifact_registry_options.h b/google/cloud/artifactregistry/artifact_registry_options.h
deleted file mode 100644
index ebc600d81af0b..0000000000000
--- a/google/cloud/artifactregistry/artifact_registry_options.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/artifactregistry/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_OPTIONS_H
-
-#include "google/cloud/artifactregistry/artifact_registry_connection.h"
-#include "google/cloud/artifactregistry/artifact_registry_connection_idempotency_policy.h"
-#include "google/cloud/artifactregistry/v1/artifact_registry_options.h"
-
-namespace google {
-namespace cloud {
-namespace artifactregistry {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use artifactregistry_v1::ArtifactRegistryPollingPolicyOption
-/// directly.
-using ::google::cloud::artifactregistry_v1::ArtifactRegistryPollingPolicyOption;
-
-/// @deprecated Use artifactregistry_v1::ArtifactRegistryBackoffPolicyOption
-/// directly.
-using ::google::cloud::artifactregistry_v1::ArtifactRegistryBackoffPolicyOption;
-
-/// @deprecated Use
-/// artifactregistry_v1::ArtifactRegistryConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::artifactregistry_v1::
-    ArtifactRegistryConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use artifactregistry_v1::ArtifactRegistryPolicyOptionList
-/// directly.
-using ::google::cloud::artifactregistry_v1::ArtifactRegistryPolicyOptionList;
-
-/// @deprecated Use artifactregistry_v1::ArtifactRegistryRetryPolicyOption
-/// directly.
-using ::google::cloud::artifactregistry_v1::ArtifactRegistryRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace artifactregistry
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_ARTIFACT_REGISTRY_OPTIONS_H
diff --git a/google/cloud/artifactregistry/mocks/mock_artifact_registry_connection.h b/google/cloud/artifactregistry/mocks/mock_artifact_registry_connection.h
deleted file mode 100644
index 76c73ef319623..0000000000000
--- a/google/cloud/artifactregistry/mocks/mock_artifact_registry_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/artifactregistry/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_MOCKS_MOCK_ARTIFACT_REGISTRY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_MOCKS_MOCK_ARTIFACT_REGISTRY_CONNECTION_H
-
-#include "google/cloud/artifactregistry/artifact_registry_connection.h"
-#include "google/cloud/artifactregistry/v1/mocks/mock_artifact_registry_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in artifactregistry_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace artifactregistry_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use artifactregistry_v1_mocks::MockArtifactRegistryConnection
-/// directly.
-using ::google::cloud::artifactregistry_v1_mocks::
-    MockArtifactRegistryConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace artifactregistry_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ARTIFACTREGISTRY_MOCKS_MOCK_ARTIFACT_REGISTRY_CONNECTION_H
diff --git a/google/cloud/asset/BUILD.bazel b/google/cloud/asset/BUILD.bazel
index 8f9655e33739c..d79d987e283b8 100644
--- a/google/cloud/asset/BUILD.bazel
+++ b/google/cloud/asset/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/asset/CMakeLists.txt b/google/cloud/asset/CMakeLists.txt
index 6666c8fc4aae3..f79442409d31d 100644
--- a/google/cloud/asset/CMakeLists.txt
+++ b/google/cloud/asset/CMakeLists.txt
@@ -19,7 +19,6 @@ include(GoogleCloudCppLibrary)
 google_cloud_cpp_add_gapic_library(
     asset "Cloud Asset API"
     SERVICE_DIRS
-        "__EMPTY__"
         "v1/"
         # orgpolicy/v**1** is used *indirectly* by google/cloud/asset, therefore
         # it does not appear in protolists/asset.list. In addition, it is not
diff --git a/google/cloud/asset/asset_client.h b/google/cloud/asset/asset_client.h
deleted file mode 100644
index bff7b3a05c1f9..0000000000000
--- a/google/cloud/asset/asset_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/asset/v1/asset_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_CLIENT_H
-
-#include "google/cloud/asset/asset_connection.h"
-#include "google/cloud/asset/v1/asset_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in asset_v1 instead of the aliases defined in
-///     this namespace.
-namespace asset {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use asset_v1::AssetServiceClient directly.
-using ::google::cloud::asset_v1::AssetServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace asset
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_CLIENT_H
diff --git a/google/cloud/asset/asset_connection.h b/google/cloud/asset/asset_connection.h
deleted file mode 100644
index 804f1f3bd0c02..0000000000000
--- a/google/cloud/asset/asset_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/asset/v1/asset_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_CONNECTION_H
-
-#include "google/cloud/asset/asset_connection_idempotency_policy.h"
-#include "google/cloud/asset/v1/asset_connection.h"
-
-namespace google {
-namespace cloud {
-namespace asset {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use asset_v1::MakeAssetServiceConnection directly.
-using ::google::cloud::asset_v1::MakeAssetServiceConnection;
-
-/// @deprecated Use asset_v1::AssetServiceConnection directly.
-using ::google::cloud::asset_v1::AssetServiceConnection;
-
-/// @deprecated Use asset_v1::AssetServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::asset_v1::AssetServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use asset_v1::AssetServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::asset_v1::AssetServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use asset_v1::AssetServiceRetryPolicy directly.
-using ::google::cloud::asset_v1::AssetServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace asset
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_CONNECTION_H
diff --git a/google/cloud/asset/asset_connection_idempotency_policy.h b/google/cloud/asset/asset_connection_idempotency_policy.h
deleted file mode 100644
index 2f34cdf3ddf67..0000000000000
--- a/google/cloud/asset/asset_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/asset/v1/asset_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/asset/v1/asset_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace asset {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use asset_v1::MakeDefaultAssetServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::asset_v1::
-    MakeDefaultAssetServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use asset_v1::AssetServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::asset_v1::AssetServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace asset
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/asset/asset_options.h b/google/cloud/asset/asset_options.h
deleted file mode 100644
index d09b4dfd6d67b..0000000000000
--- a/google/cloud/asset/asset_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/asset/v1/asset_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_OPTIONS_H
-
-#include "google/cloud/asset/asset_connection.h"
-#include "google/cloud/asset/asset_connection_idempotency_policy.h"
-#include "google/cloud/asset/v1/asset_options.h"
-
-namespace google {
-namespace cloud {
-namespace asset {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use asset_v1::AssetServicePollingPolicyOption directly.
-using ::google::cloud::asset_v1::AssetServicePollingPolicyOption;
-
-/// @deprecated Use asset_v1::AssetServiceBackoffPolicyOption directly.
-using ::google::cloud::asset_v1::AssetServiceBackoffPolicyOption;
-
-/// @deprecated Use asset_v1::AssetServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::asset_v1::AssetServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use asset_v1::AssetServicePolicyOptionList directly.
-using ::google::cloud::asset_v1::AssetServicePolicyOptionList;
-
-/// @deprecated Use asset_v1::AssetServiceRetryPolicyOption directly.
-using ::google::cloud::asset_v1::AssetServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace asset
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_ASSET_OPTIONS_H
diff --git a/google/cloud/asset/mocks/mock_asset_connection.h b/google/cloud/asset/mocks/mock_asset_connection.h
deleted file mode 100644
index 5e1942dd419eb..0000000000000
--- a/google/cloud/asset/mocks/mock_asset_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/asset/v1/asset_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_MOCKS_MOCK_ASSET_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_MOCKS_MOCK_ASSET_CONNECTION_H
-
-#include "google/cloud/asset/asset_connection.h"
-#include "google/cloud/asset/v1/mocks/mock_asset_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in asset_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace asset_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use asset_v1_mocks::MockAssetServiceConnection directly.
-using ::google::cloud::asset_v1_mocks::MockAssetServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace asset_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSET_MOCKS_MOCK_ASSET_CONNECTION_H
diff --git a/google/cloud/assuredworkloads/BUILD.bazel b/google/cloud/assuredworkloads/BUILD.bazel
index e999e230a4aee..d5f42fa943315 100644
--- a/google/cloud/assuredworkloads/BUILD.bazel
+++ b/google/cloud/assuredworkloads/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/assuredworkloads/CMakeLists.txt b/google/cloud/assuredworkloads/CMakeLists.txt
index 2508a6b1afc23..000704d148d18 100644
--- a/google/cloud/assuredworkloads/CMakeLists.txt
+++ b/google/cloud/assuredworkloads/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(assuredworkloads "Assured Workloads API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(assuredworkloads_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/assuredworkloads/assured_workloads_client.h b/google/cloud/assuredworkloads/assured_workloads_client.h
deleted file mode 100644
index 02eca9191d101..0000000000000
--- a/google/cloud/assuredworkloads/assured_workloads_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/assuredworkloads/v1/assuredworkloads.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_CLIENT_H
-
-#include "google/cloud/assuredworkloads/assured_workloads_connection.h"
-#include "google/cloud/assuredworkloads/v1/assured_workloads_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in assuredworkloads_v1 instead of the aliases defined in
-///     this namespace.
-namespace assuredworkloads {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use assuredworkloads_v1::AssuredWorkloadsServiceClient directly.
-using ::google::cloud::assuredworkloads_v1::AssuredWorkloadsServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace assuredworkloads
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_CLIENT_H
diff --git a/google/cloud/assuredworkloads/assured_workloads_connection.h b/google/cloud/assuredworkloads/assured_workloads_connection.h
deleted file mode 100644
index 71bbcfe0a23da..0000000000000
--- a/google/cloud/assuredworkloads/assured_workloads_connection.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/assuredworkloads/v1/assuredworkloads.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_CONNECTION_H
-
-#include "google/cloud/assuredworkloads/assured_workloads_connection_idempotency_policy.h"
-#include "google/cloud/assuredworkloads/v1/assured_workloads_connection.h"
-
-namespace google {
-namespace cloud {
-namespace assuredworkloads {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use assuredworkloads_v1::MakeAssuredWorkloadsServiceConnection
-/// directly.
-using ::google::cloud::assuredworkloads_v1::
-    MakeAssuredWorkloadsServiceConnection;
-
-/// @deprecated Use assuredworkloads_v1::AssuredWorkloadsServiceConnection
-/// directly.
-using ::google::cloud::assuredworkloads_v1::AssuredWorkloadsServiceConnection;
-
-/// @deprecated Use
-/// assuredworkloads_v1::AssuredWorkloadsServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::assuredworkloads_v1::
-    AssuredWorkloadsServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// assuredworkloads_v1::AssuredWorkloadsServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::assuredworkloads_v1::
-    AssuredWorkloadsServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use assuredworkloads_v1::AssuredWorkloadsServiceRetryPolicy
-/// directly.
-using ::google::cloud::assuredworkloads_v1::AssuredWorkloadsServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace assuredworkloads
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_CONNECTION_H
diff --git a/google/cloud/assuredworkloads/assured_workloads_connection_idempotency_policy.h b/google/cloud/assuredworkloads/assured_workloads_connection_idempotency_policy.h
deleted file mode 100644
index 904e74012f079..0000000000000
--- a/google/cloud/assuredworkloads/assured_workloads_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/assuredworkloads/v1/assuredworkloads.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/assuredworkloads/v1/assured_workloads_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace assuredworkloads {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// assuredworkloads_v1::MakeDefaultAssuredWorkloadsServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::assuredworkloads_v1::
-    MakeDefaultAssuredWorkloadsServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// assuredworkloads_v1::AssuredWorkloadsServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::assuredworkloads_v1::
-    AssuredWorkloadsServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace assuredworkloads
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/assuredworkloads/assured_workloads_options.h b/google/cloud/assuredworkloads/assured_workloads_options.h
deleted file mode 100644
index 658ab48c70bcb..0000000000000
--- a/google/cloud/assuredworkloads/assured_workloads_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/assuredworkloads/v1/assuredworkloads.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_OPTIONS_H
-
-#include "google/cloud/assuredworkloads/assured_workloads_connection.h"
-#include "google/cloud/assuredworkloads/assured_workloads_connection_idempotency_policy.h"
-#include "google/cloud/assuredworkloads/v1/assured_workloads_options.h"
-
-namespace google {
-namespace cloud {
-namespace assuredworkloads {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// assuredworkloads_v1::AssuredWorkloadsServicePollingPolicyOption directly.
-using ::google::cloud::assuredworkloads_v1::
-    AssuredWorkloadsServicePollingPolicyOption;
-
-/// @deprecated Use
-/// assuredworkloads_v1::AssuredWorkloadsServiceBackoffPolicyOption directly.
-using ::google::cloud::assuredworkloads_v1::
-    AssuredWorkloadsServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// assuredworkloads_v1::AssuredWorkloadsServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::assuredworkloads_v1::
-    AssuredWorkloadsServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use assuredworkloads_v1::AssuredWorkloadsServicePolicyOptionList
-/// directly.
-using ::google::cloud::assuredworkloads_v1::
-    AssuredWorkloadsServicePolicyOptionList;
-
-/// @deprecated Use
-/// assuredworkloads_v1::AssuredWorkloadsServiceRetryPolicyOption directly.
-using ::google::cloud::assuredworkloads_v1::
-    AssuredWorkloadsServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace assuredworkloads
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_ASSURED_WORKLOADS_OPTIONS_H
diff --git a/google/cloud/assuredworkloads/mocks/mock_assured_workloads_connection.h b/google/cloud/assuredworkloads/mocks/mock_assured_workloads_connection.h
deleted file mode 100644
index a3c2084eeab7b..0000000000000
--- a/google/cloud/assuredworkloads/mocks/mock_assured_workloads_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/assuredworkloads/v1/assuredworkloads.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_MOCKS_MOCK_ASSURED_WORKLOADS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_MOCKS_MOCK_ASSURED_WORKLOADS_CONNECTION_H
-
-#include "google/cloud/assuredworkloads/assured_workloads_connection.h"
-#include "google/cloud/assuredworkloads/v1/mocks/mock_assured_workloads_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in assuredworkloads_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace assuredworkloads_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// assuredworkloads_v1_mocks::MockAssuredWorkloadsServiceConnection directly.
-using ::google::cloud::assuredworkloads_v1_mocks::
-    MockAssuredWorkloadsServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace assuredworkloads_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ASSUREDWORKLOADS_MOCKS_MOCK_ASSURED_WORKLOADS_CONNECTION_H
diff --git a/google/cloud/automl/BUILD.bazel b/google/cloud/automl/BUILD.bazel
index 49ee509b3940d..2c2fffeb097d6 100644
--- a/google/cloud/automl/BUILD.bazel
+++ b/google/cloud/automl/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/automl/CMakeLists.txt b/google/cloud/automl/CMakeLists.txt
index 9a1847f2d83b7..15d96c9942eb8 100644
--- a/google/cloud/automl/CMakeLists.txt
+++ b/google/cloud/automl/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(automl "Cloud AutoML API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+google_cloud_cpp_add_gapic_library(automl "Cloud AutoML API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(automl_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/automl/auto_ml_client.h b/google/cloud/automl/auto_ml_client.h
deleted file mode 100644
index e81071bc20f62..0000000000000
--- a/google/cloud/automl/auto_ml_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_CLIENT_H
-
-#include "google/cloud/automl/auto_ml_connection.h"
-#include "google/cloud/automl/v1/auto_ml_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in automl_v1 instead of the aliases defined in
-///     this namespace.
-namespace automl {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use automl_v1::AutoMlClient directly.
-using ::google::cloud::automl_v1::AutoMlClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_CLIENT_H
diff --git a/google/cloud/automl/auto_ml_connection.h b/google/cloud/automl/auto_ml_connection.h
deleted file mode 100644
index 816afb7339679..0000000000000
--- a/google/cloud/automl/auto_ml_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_CONNECTION_H
-
-#include "google/cloud/automl/auto_ml_connection_idempotency_policy.h"
-#include "google/cloud/automl/v1/auto_ml_connection.h"
-
-namespace google {
-namespace cloud {
-namespace automl {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use automl_v1::MakeAutoMlConnection directly.
-using ::google::cloud::automl_v1::MakeAutoMlConnection;
-
-/// @deprecated Use automl_v1::AutoMlConnection directly.
-using ::google::cloud::automl_v1::AutoMlConnection;
-
-/// @deprecated Use automl_v1::AutoMlLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::automl_v1::AutoMlLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use automl_v1::AutoMlLimitedTimeRetryPolicy directly.
-using ::google::cloud::automl_v1::AutoMlLimitedTimeRetryPolicy;
-
-/// @deprecated Use automl_v1::AutoMlRetryPolicy directly.
-using ::google::cloud::automl_v1::AutoMlRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_CONNECTION_H
diff --git a/google/cloud/automl/auto_ml_connection_idempotency_policy.h b/google/cloud/automl/auto_ml_connection_idempotency_policy.h
deleted file mode 100644
index a2e3d38147feb..0000000000000
--- a/google/cloud/automl/auto_ml_connection_idempotency_policy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/automl/v1/auto_ml_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace automl {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use automl_v1::MakeDefaultAutoMlConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::automl_v1::MakeDefaultAutoMlConnectionIdempotencyPolicy;
-
-/// @deprecated Use automl_v1::AutoMlConnectionIdempotencyPolicy directly.
-using ::google::cloud::automl_v1::AutoMlConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/automl/auto_ml_options.h b/google/cloud/automl/auto_ml_options.h
deleted file mode 100644
index d78d664a98ac3..0000000000000
--- a/google/cloud/automl/auto_ml_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_OPTIONS_H
-
-#include "google/cloud/automl/auto_ml_connection.h"
-#include "google/cloud/automl/auto_ml_connection_idempotency_policy.h"
-#include "google/cloud/automl/v1/auto_ml_options.h"
-
-namespace google {
-namespace cloud {
-namespace automl {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use automl_v1::AutoMlPollingPolicyOption directly.
-using ::google::cloud::automl_v1::AutoMlPollingPolicyOption;
-
-/// @deprecated Use automl_v1::AutoMlBackoffPolicyOption directly.
-using ::google::cloud::automl_v1::AutoMlBackoffPolicyOption;
-
-/// @deprecated Use automl_v1::AutoMlConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::automl_v1::AutoMlConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use automl_v1::AutoMlPolicyOptionList directly.
-using ::google::cloud::automl_v1::AutoMlPolicyOptionList;
-
-/// @deprecated Use automl_v1::AutoMlRetryPolicyOption directly.
-using ::google::cloud::automl_v1::AutoMlRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_AUTO_ML_OPTIONS_H
diff --git a/google/cloud/automl/mocks/mock_auto_ml_connection.h b/google/cloud/automl/mocks/mock_auto_ml_connection.h
deleted file mode 100644
index 37176375063a8..0000000000000
--- a/google/cloud/automl/mocks/mock_auto_ml_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_MOCKS_MOCK_AUTO_ML_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_MOCKS_MOCK_AUTO_ML_CONNECTION_H
-
-#include "google/cloud/automl/auto_ml_connection.h"
-#include "google/cloud/automl/v1/mocks/mock_auto_ml_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in automl_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace automl_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use automl_v1_mocks::MockAutoMlConnection directly.
-using ::google::cloud::automl_v1_mocks::MockAutoMlConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_MOCKS_MOCK_AUTO_ML_CONNECTION_H
diff --git a/google/cloud/automl/mocks/mock_prediction_connection.h b/google/cloud/automl/mocks/mock_prediction_connection.h
deleted file mode 100644
index e2ba2faf7013e..0000000000000
--- a/google/cloud/automl/mocks/mock_prediction_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_MOCKS_MOCK_PREDICTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_MOCKS_MOCK_PREDICTION_CONNECTION_H
-
-#include "google/cloud/automl/prediction_connection.h"
-#include "google/cloud/automl/v1/mocks/mock_prediction_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in automl_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace automl_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use automl_v1_mocks::MockPredictionServiceConnection directly.
-using ::google::cloud::automl_v1_mocks::MockPredictionServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_MOCKS_MOCK_PREDICTION_CONNECTION_H
diff --git a/google/cloud/automl/prediction_client.h b/google/cloud/automl/prediction_client.h
deleted file mode 100644
index 5539add369f4a..0000000000000
--- a/google/cloud/automl/prediction_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_CLIENT_H
-
-#include "google/cloud/automl/prediction_connection.h"
-#include "google/cloud/automl/v1/prediction_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in automl_v1 instead of the aliases defined in
-///     this namespace.
-namespace automl {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use automl_v1::PredictionServiceClient directly.
-using ::google::cloud::automl_v1::PredictionServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_CLIENT_H
diff --git a/google/cloud/automl/prediction_connection.h b/google/cloud/automl/prediction_connection.h
deleted file mode 100644
index 3191c0c3e1647..0000000000000
--- a/google/cloud/automl/prediction_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_CONNECTION_H
-
-#include "google/cloud/automl/prediction_connection_idempotency_policy.h"
-#include "google/cloud/automl/v1/prediction_connection.h"
-
-namespace google {
-namespace cloud {
-namespace automl {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use automl_v1::MakePredictionServiceConnection directly.
-using ::google::cloud::automl_v1::MakePredictionServiceConnection;
-
-/// @deprecated Use automl_v1::PredictionServiceConnection directly.
-using ::google::cloud::automl_v1::PredictionServiceConnection;
-
-/// @deprecated Use automl_v1::PredictionServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::automl_v1::PredictionServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use automl_v1::PredictionServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::automl_v1::PredictionServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use automl_v1::PredictionServiceRetryPolicy directly.
-using ::google::cloud::automl_v1::PredictionServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_CONNECTION_H
diff --git a/google/cloud/automl/prediction_connection_idempotency_policy.h b/google/cloud/automl/prediction_connection_idempotency_policy.h
deleted file mode 100644
index c024d7fe06eea..0000000000000
--- a/google/cloud/automl/prediction_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/automl/v1/prediction_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace automl {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// automl_v1::MakeDefaultPredictionServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::automl_v1::
-    MakeDefaultPredictionServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use automl_v1::PredictionServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::automl_v1::PredictionServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/automl/prediction_options.h b/google/cloud/automl/prediction_options.h
deleted file mode 100644
index d1de0bfff3371..0000000000000
--- a/google/cloud/automl/prediction_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/automl/v1/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_OPTIONS_H
-
-#include "google/cloud/automl/prediction_connection.h"
-#include "google/cloud/automl/prediction_connection_idempotency_policy.h"
-#include "google/cloud/automl/v1/prediction_options.h"
-
-namespace google {
-namespace cloud {
-namespace automl {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use automl_v1::PredictionServicePollingPolicyOption directly.
-using ::google::cloud::automl_v1::PredictionServicePollingPolicyOption;
-
-/// @deprecated Use automl_v1::PredictionServiceBackoffPolicyOption directly.
-using ::google::cloud::automl_v1::PredictionServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// automl_v1::PredictionServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::automl_v1::
-    PredictionServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use automl_v1::PredictionServicePolicyOptionList directly.
-using ::google::cloud::automl_v1::PredictionServicePolicyOptionList;
-
-/// @deprecated Use automl_v1::PredictionServiceRetryPolicyOption directly.
-using ::google::cloud::automl_v1::PredictionServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace automl
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_AUTOML_PREDICTION_OPTIONS_H
diff --git a/google/cloud/baremetalsolution/BUILD.bazel b/google/cloud/baremetalsolution/BUILD.bazel
index fadae5a55dd74..9b3f22d958b28 100644
--- a/google/cloud/baremetalsolution/BUILD.bazel
+++ b/google/cloud/baremetalsolution/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v2/",
 ]
 
diff --git a/google/cloud/baremetalsolution/CMakeLists.txt b/google/cloud/baremetalsolution/CMakeLists.txt
index e0ec28f2cb48b..e3051db7e264e 100644
--- a/google/cloud/baremetalsolution/CMakeLists.txt
+++ b/google/cloud/baremetalsolution/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(baremetalsolution "Bare Metal Solution API"
-                                   SERVICE_DIRS "__EMPTY__" "v2/")
+                                   SERVICE_DIRS "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(baremetalsolution_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/baremetalsolution/bare_metal_solution_client.h b/google/cloud/baremetalsolution/bare_metal_solution_client.h
deleted file mode 100644
index a94eb474aa8a1..0000000000000
--- a/google/cloud/baremetalsolution/bare_metal_solution_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/baremetalsolution/v2/baremetalsolution.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_CLIENT_H
-
-#include "google/cloud/baremetalsolution/bare_metal_solution_connection.h"
-#include "google/cloud/baremetalsolution/v2/bare_metal_solution_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in baremetalsolution_v2 instead of the aliases defined in
-///     this namespace.
-namespace baremetalsolution {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use baremetalsolution_v2::BareMetalSolutionClient directly.
-using ::google::cloud::baremetalsolution_v2::BareMetalSolutionClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace baremetalsolution
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_CLIENT_H
diff --git a/google/cloud/baremetalsolution/bare_metal_solution_connection.h b/google/cloud/baremetalsolution/bare_metal_solution_connection.h
deleted file mode 100644
index e7915dc0c9f3e..0000000000000
--- a/google/cloud/baremetalsolution/bare_metal_solution_connection.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/baremetalsolution/v2/baremetalsolution.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_CONNECTION_H
-
-#include "google/cloud/baremetalsolution/bare_metal_solution_connection_idempotency_policy.h"
-#include "google/cloud/baremetalsolution/v2/bare_metal_solution_connection.h"
-
-namespace google {
-namespace cloud {
-namespace baremetalsolution {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use baremetalsolution_v2::MakeBareMetalSolutionConnection
-/// directly.
-using ::google::cloud::baremetalsolution_v2::MakeBareMetalSolutionConnection;
-
-/// @deprecated Use baremetalsolution_v2::BareMetalSolutionConnection directly.
-using ::google::cloud::baremetalsolution_v2::BareMetalSolutionConnection;
-
-/// @deprecated Use
-/// baremetalsolution_v2::BareMetalSolutionLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::baremetalsolution_v2::
-    BareMetalSolutionLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// baremetalsolution_v2::BareMetalSolutionLimitedTimeRetryPolicy directly.
-using ::google::cloud::baremetalsolution_v2::
-    BareMetalSolutionLimitedTimeRetryPolicy;
-
-/// @deprecated Use baremetalsolution_v2::BareMetalSolutionRetryPolicy directly.
-using ::google::cloud::baremetalsolution_v2::BareMetalSolutionRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace baremetalsolution
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_CONNECTION_H
diff --git a/google/cloud/baremetalsolution/bare_metal_solution_connection_idempotency_policy.h b/google/cloud/baremetalsolution/bare_metal_solution_connection_idempotency_policy.h
deleted file mode 100644
index e06ada6977fea..0000000000000
--- a/google/cloud/baremetalsolution/bare_metal_solution_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/baremetalsolution/v2/baremetalsolution.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/baremetalsolution/v2/bare_metal_solution_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace baremetalsolution {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// baremetalsolution_v2::MakeDefaultBareMetalSolutionConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::baremetalsolution_v2::
-    MakeDefaultBareMetalSolutionConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// baremetalsolution_v2::BareMetalSolutionConnectionIdempotencyPolicy directly.
-using ::google::cloud::baremetalsolution_v2::
-    BareMetalSolutionConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace baremetalsolution
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/baremetalsolution/bare_metal_solution_options.h b/google/cloud/baremetalsolution/bare_metal_solution_options.h
deleted file mode 100644
index 6bfbe7d78211f..0000000000000
--- a/google/cloud/baremetalsolution/bare_metal_solution_options.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/baremetalsolution/v2/baremetalsolution.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_OPTIONS_H
-
-#include "google/cloud/baremetalsolution/bare_metal_solution_connection.h"
-#include "google/cloud/baremetalsolution/bare_metal_solution_connection_idempotency_policy.h"
-#include "google/cloud/baremetalsolution/v2/bare_metal_solution_options.h"
-
-namespace google {
-namespace cloud {
-namespace baremetalsolution {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use baremetalsolution_v2::BareMetalSolutionPollingPolicyOption
-/// directly.
-using ::google::cloud::baremetalsolution_v2::
-    BareMetalSolutionPollingPolicyOption;
-
-/// @deprecated Use baremetalsolution_v2::BareMetalSolutionBackoffPolicyOption
-/// directly.
-using ::google::cloud::baremetalsolution_v2::
-    BareMetalSolutionBackoffPolicyOption;
-
-/// @deprecated Use
-/// baremetalsolution_v2::BareMetalSolutionConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::baremetalsolution_v2::
-    BareMetalSolutionConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use baremetalsolution_v2::BareMetalSolutionPolicyOptionList
-/// directly.
-using ::google::cloud::baremetalsolution_v2::BareMetalSolutionPolicyOptionList;
-
-/// @deprecated Use baremetalsolution_v2::BareMetalSolutionRetryPolicyOption
-/// directly.
-using ::google::cloud::baremetalsolution_v2::BareMetalSolutionRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace baremetalsolution
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_BARE_METAL_SOLUTION_OPTIONS_H
diff --git a/google/cloud/baremetalsolution/mocks/mock_bare_metal_solution_connection.h b/google/cloud/baremetalsolution/mocks/mock_bare_metal_solution_connection.h
deleted file mode 100644
index c417c27e9a693..0000000000000
--- a/google/cloud/baremetalsolution/mocks/mock_bare_metal_solution_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/baremetalsolution/v2/baremetalsolution.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_MOCKS_MOCK_BARE_METAL_SOLUTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_MOCKS_MOCK_BARE_METAL_SOLUTION_CONNECTION_H
-
-#include "google/cloud/baremetalsolution/bare_metal_solution_connection.h"
-#include "google/cloud/baremetalsolution/v2/mocks/mock_bare_metal_solution_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in baremetalsolution_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace baremetalsolution_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use baremetalsolution_v2_mocks::MockBareMetalSolutionConnection
-/// directly.
-using ::google::cloud::baremetalsolution_v2_mocks::
-    MockBareMetalSolutionConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace baremetalsolution_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BAREMETALSOLUTION_MOCKS_MOCK_BARE_METAL_SOLUTION_CONNECTION_H
diff --git a/google/cloud/batch/BUILD.bazel b/google/cloud/batch/BUILD.bazel
index 691baa13daf72..b5e81a5df7aaf 100644
--- a/google/cloud/batch/BUILD.bazel
+++ b/google/cloud/batch/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/batch/CMakeLists.txt b/google/cloud/batch/CMakeLists.txt
index fae373f2eecd9..7de07e2d24d69 100644
--- a/google/cloud/batch/CMakeLists.txt
+++ b/google/cloud/batch/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(batch "Batch API" SERVICE_DIRS "__EMPTY__"
-                                                                  "v1/")
+google_cloud_cpp_add_gapic_library(batch "Batch API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(batch_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/batch/batch_client.h b/google/cloud/batch/batch_client.h
deleted file mode 100644
index 39ee96fbba302..0000000000000
--- a/google/cloud/batch/batch_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/batch/v1/batch.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_CLIENT_H
-
-#include "google/cloud/batch/batch_connection.h"
-#include "google/cloud/batch/v1/batch_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in batch_v1 instead of the aliases defined in
-///     this namespace.
-namespace batch {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use batch_v1::BatchServiceClient directly.
-using ::google::cloud::batch_v1::BatchServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace batch
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_CLIENT_H
diff --git a/google/cloud/batch/batch_connection.h b/google/cloud/batch/batch_connection.h
deleted file mode 100644
index ac1b4838740b1..0000000000000
--- a/google/cloud/batch/batch_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/batch/v1/batch.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_CONNECTION_H
-
-#include "google/cloud/batch/batch_connection_idempotency_policy.h"
-#include "google/cloud/batch/v1/batch_connection.h"
-
-namespace google {
-namespace cloud {
-namespace batch {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use batch_v1::MakeBatchServiceConnection directly.
-using ::google::cloud::batch_v1::MakeBatchServiceConnection;
-
-/// @deprecated Use batch_v1::BatchServiceConnection directly.
-using ::google::cloud::batch_v1::BatchServiceConnection;
-
-/// @deprecated Use batch_v1::BatchServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::batch_v1::BatchServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use batch_v1::BatchServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::batch_v1::BatchServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use batch_v1::BatchServiceRetryPolicy directly.
-using ::google::cloud::batch_v1::BatchServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace batch
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_CONNECTION_H
diff --git a/google/cloud/batch/batch_connection_idempotency_policy.h b/google/cloud/batch/batch_connection_idempotency_policy.h
deleted file mode 100644
index 09358aa9fff0e..0000000000000
--- a/google/cloud/batch/batch_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/batch/v1/batch.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/batch/v1/batch_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace batch {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use batch_v1::MakeDefaultBatchServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::batch_v1::
-    MakeDefaultBatchServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use batch_v1::BatchServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::batch_v1::BatchServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace batch
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/batch/batch_options.h b/google/cloud/batch/batch_options.h
deleted file mode 100644
index b72ecba673e82..0000000000000
--- a/google/cloud/batch/batch_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/batch/v1/batch.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_OPTIONS_H
-
-#include "google/cloud/batch/batch_connection.h"
-#include "google/cloud/batch/batch_connection_idempotency_policy.h"
-#include "google/cloud/batch/v1/batch_options.h"
-
-namespace google {
-namespace cloud {
-namespace batch {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use batch_v1::BatchServicePollingPolicyOption directly.
-using ::google::cloud::batch_v1::BatchServicePollingPolicyOption;
-
-/// @deprecated Use batch_v1::BatchServiceBackoffPolicyOption directly.
-using ::google::cloud::batch_v1::BatchServiceBackoffPolicyOption;
-
-/// @deprecated Use batch_v1::BatchServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::batch_v1::BatchServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use batch_v1::BatchServicePolicyOptionList directly.
-using ::google::cloud::batch_v1::BatchServicePolicyOptionList;
-
-/// @deprecated Use batch_v1::BatchServiceRetryPolicyOption directly.
-using ::google::cloud::batch_v1::BatchServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace batch
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_BATCH_OPTIONS_H
diff --git a/google/cloud/batch/mocks/mock_batch_connection.h b/google/cloud/batch/mocks/mock_batch_connection.h
deleted file mode 100644
index 83e2af3d253d8..0000000000000
--- a/google/cloud/batch/mocks/mock_batch_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/batch/v1/batch.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_MOCKS_MOCK_BATCH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_MOCKS_MOCK_BATCH_CONNECTION_H
-
-#include "google/cloud/batch/batch_connection.h"
-#include "google/cloud/batch/v1/mocks/mock_batch_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in batch_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace batch_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use batch_v1_mocks::MockBatchServiceConnection directly.
-using ::google::cloud::batch_v1_mocks::MockBatchServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace batch_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BATCH_MOCKS_MOCK_BATCH_CONNECTION_H
diff --git a/google/cloud/beyondcorp/BUILD.bazel b/google/cloud/beyondcorp/BUILD.bazel
index 89621433e4780..10d7d8f39750f 100644
--- a/google/cloud/beyondcorp/BUILD.bazel
+++ b/google/cloud/beyondcorp/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "appconnections/v1/",
     "appconnectors/v1/",
     "appgateways/v1/",
diff --git a/google/cloud/beyondcorp/CMakeLists.txt b/google/cloud/beyondcorp/CMakeLists.txt
index fdcdab5e15ce6..2e358192deb67 100644
--- a/google/cloud/beyondcorp/CMakeLists.txt
+++ b/google/cloud/beyondcorp/CMakeLists.txt
@@ -18,8 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     beyondcorp "BeyondCorp API"
-    SERVICE_DIRS "__EMPTY__" "appconnections/v1/" "appconnectors/v1/"
-                 "appgateways/v1/")
+    SERVICE_DIRS "appconnections/v1/" "appconnectors/v1/" "appgateways/v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(beyondcorp_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/beyondcorp/app_connections_client.h b/google/cloud/beyondcorp/app_connections_client.h
deleted file mode 100644
index a841e175bd2e9..0000000000000
--- a/google/cloud/beyondcorp/app_connections_client.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source:
-// google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_CLIENT_H
-
-#include "google/cloud/beyondcorp/app_connections_connection.h"
-#include "google/cloud/beyondcorp/appconnections/v1/app_connections_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in beyondcorp_appconnections_v1 instead of the aliases
-///     defined in this namespace.
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use beyondcorp_appconnections_v1::AppConnectionsServiceClient
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_CLIENT_H
diff --git a/google/cloud/beyondcorp/app_connections_connection.h b/google/cloud/beyondcorp/app_connections_connection.h
deleted file mode 100644
index e007c9d21f015..0000000000000
--- a/google/cloud/beyondcorp/app_connections_connection.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source:
-// google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_CONNECTION_H
-
-#include "google/cloud/beyondcorp/app_connections_connection_idempotency_policy.h"
-#include "google/cloud/beyondcorp/appconnections/v1/app_connections_connection.h"
-
-namespace google {
-namespace cloud {
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::MakeAppConnectionsServiceConnection directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    MakeAppConnectionsServiceConnection;
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServiceConnection directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServiceConnection;
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServiceRetryPolicy directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_CONNECTION_H
diff --git a/google/cloud/beyondcorp/app_connections_connection_idempotency_policy.h b/google/cloud/beyondcorp/app_connections_connection_idempotency_policy.h
deleted file mode 100644
index 267e80aa2b05b..0000000000000
--- a/google/cloud/beyondcorp/app_connections_connection_idempotency_policy.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source:
-// google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/beyondcorp/appconnections/v1/app_connections_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::MakeDefaultAppConnectionsServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    MakeDefaultAppConnectionsServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/beyondcorp/app_connections_options.h b/google/cloud/beyondcorp/app_connections_options.h
deleted file mode 100644
index e71951ae3e3a8..0000000000000
--- a/google/cloud/beyondcorp/app_connections_options.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source:
-// google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_OPTIONS_H
-
-#include "google/cloud/beyondcorp/app_connections_connection.h"
-#include "google/cloud/beyondcorp/app_connections_connection_idempotency_policy.h"
-#include "google/cloud/beyondcorp/appconnections/v1/app_connections_options.h"
-
-namespace google {
-namespace cloud {
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServicePollingPolicyOption
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServicePollingPolicyOption;
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServicePolicyOptionList
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServicePolicyOptionList;
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1::AppConnectionsServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1::
-    AppConnectionsServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTIONS_OPTIONS_H
diff --git a/google/cloud/beyondcorp/app_connectors_client.h b/google/cloud/beyondcorp/app_connectors_client.h
deleted file mode 100644
index ac15683cc2805..0000000000000
--- a/google/cloud/beyondcorp/app_connectors_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_CLIENT_H
-
-#include "google/cloud/beyondcorp/app_connectors_connection.h"
-#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in beyondcorp_appconnectors_v1 instead of the aliases
-///     defined in this namespace.
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use beyondcorp_appconnectors_v1::AppConnectorsServiceClient
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::AppConnectorsServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_CLIENT_H
diff --git a/google/cloud/beyondcorp/app_connectors_connection.h b/google/cloud/beyondcorp/app_connectors_connection.h
deleted file mode 100644
index 0703c1726f1de..0000000000000
--- a/google/cloud/beyondcorp/app_connectors_connection.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_CONNECTION_H
-
-#include "google/cloud/beyondcorp/app_connectors_connection_idempotency_policy.h"
-#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection.h"
-
-namespace google {
-namespace cloud {
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::MakeAppConnectorsServiceConnection directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    MakeAppConnectorsServiceConnection;
-
-/// @deprecated Use beyondcorp_appconnectors_v1::AppConnectorsServiceConnection
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServiceConnection;
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::AppConnectorsServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::AppConnectorsServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use beyondcorp_appconnectors_v1::AppConnectorsServiceRetryPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_CONNECTION_H
diff --git a/google/cloud/beyondcorp/app_connectors_connection_idempotency_policy.h b/google/cloud/beyondcorp/app_connectors_connection_idempotency_policy.h
deleted file mode 100644
index 843387259f446..0000000000000
--- a/google/cloud/beyondcorp/app_connectors_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::MakeDefaultAppConnectorsServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    MakeDefaultAppConnectorsServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::AppConnectorsServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/beyondcorp/app_connectors_options.h b/google/cloud/beyondcorp/app_connectors_options.h
deleted file mode 100644
index 8063446bc3df9..0000000000000
--- a/google/cloud/beyondcorp/app_connectors_options.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_OPTIONS_H
-
-#include "google/cloud/beyondcorp/app_connectors_connection.h"
-#include "google/cloud/beyondcorp/app_connectors_connection_idempotency_policy.h"
-#include "google/cloud/beyondcorp/appconnectors/v1/app_connectors_options.h"
-
-namespace google {
-namespace cloud {
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::AppConnectorsServicePollingPolicyOption
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServicePollingPolicyOption;
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::AppConnectorsServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::AppConnectorsServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::AppConnectorsServicePolicyOptionList directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServicePolicyOptionList;
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1::AppConnectorsServiceRetryPolicyOption directly.
-using ::google::cloud::beyondcorp_appconnectors_v1::
-    AppConnectorsServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_CONNECTORS_OPTIONS_H
diff --git a/google/cloud/beyondcorp/app_gateways_client.h b/google/cloud/beyondcorp/app_gateways_client.h
deleted file mode 100644
index 4fbf2585f8232..0000000000000
--- a/google/cloud/beyondcorp/app_gateways_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_CLIENT_H
-
-#include "google/cloud/beyondcorp/app_gateways_connection.h"
-#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in beyondcorp_appgateways_v1 instead of the aliases
-///     defined in this namespace.
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use beyondcorp_appgateways_v1::AppGatewaysServiceClient
-/// directly.
-using ::google::cloud::beyondcorp_appgateways_v1::AppGatewaysServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_CLIENT_H
diff --git a/google/cloud/beyondcorp/app_gateways_connection.h b/google/cloud/beyondcorp/app_gateways_connection.h
deleted file mode 100644
index a47ca91cfa0d8..0000000000000
--- a/google/cloud/beyondcorp/app_gateways_connection.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_CONNECTION_H
-
-#include "google/cloud/beyondcorp/app_gateways_connection_idempotency_policy.h"
-#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_connection.h"
-
-namespace google {
-namespace cloud {
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use beyondcorp_appgateways_v1::MakeAppGatewaysServiceConnection
-/// directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    MakeAppGatewaysServiceConnection;
-
-/// @deprecated Use beyondcorp_appgateways_v1::AppGatewaysServiceConnection
-/// directly.
-using ::google::cloud::beyondcorp_appgateways_v1::AppGatewaysServiceConnection;
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1::AppGatewaysServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    AppGatewaysServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1::AppGatewaysServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    AppGatewaysServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use beyondcorp_appgateways_v1::AppGatewaysServiceRetryPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appgateways_v1::AppGatewaysServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_CONNECTION_H
diff --git a/google/cloud/beyondcorp/app_gateways_connection_idempotency_policy.h b/google/cloud/beyondcorp/app_gateways_connection_idempotency_policy.h
deleted file mode 100644
index f04d58be7d850..0000000000000
--- a/google/cloud/beyondcorp/app_gateways_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1::MakeDefaultAppGatewaysServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    MakeDefaultAppGatewaysServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1::AppGatewaysServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    AppGatewaysServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/beyondcorp/app_gateways_options.h b/google/cloud/beyondcorp/app_gateways_options.h
deleted file mode 100644
index b850da294655f..0000000000000
--- a/google/cloud/beyondcorp/app_gateways_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_OPTIONS_H
-
-#include "google/cloud/beyondcorp/app_gateways_connection.h"
-#include "google/cloud/beyondcorp/app_gateways_connection_idempotency_policy.h"
-#include "google/cloud/beyondcorp/appgateways/v1/app_gateways_options.h"
-
-namespace google {
-namespace cloud {
-namespace beyondcorp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1::AppGatewaysServicePollingPolicyOption directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    AppGatewaysServicePollingPolicyOption;
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1::AppGatewaysServiceBackoffPolicyOption directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    AppGatewaysServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1::AppGatewaysServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    AppGatewaysServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1::AppGatewaysServicePolicyOptionList directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    AppGatewaysServicePolicyOptionList;
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1::AppGatewaysServiceRetryPolicyOption directly.
-using ::google::cloud::beyondcorp_appgateways_v1::
-    AppGatewaysServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_APP_GATEWAYS_OPTIONS_H
diff --git a/google/cloud/beyondcorp/mocks/mock_app_connections_connection.h b/google/cloud/beyondcorp/mocks/mock_app_connections_connection.h
deleted file mode 100644
index a0d3fe2ab466c..0000000000000
--- a/google/cloud/beyondcorp/mocks/mock_app_connections_connection.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source:
-// google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_MOCKS_MOCK_APP_CONNECTIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_MOCKS_MOCK_APP_CONNECTIONS_CONNECTION_H
-
-#include "google/cloud/beyondcorp/app_connections_connection.h"
-#include "google/cloud/beyondcorp/appconnections/v1/mocks/mock_app_connections_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in beyondcorp_appconnections_v1_mocks instead of the
-///     aliases defined in this namespace.
-namespace beyondcorp_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appconnections_v1_mocks::MockAppConnectionsServiceConnection
-/// directly.
-using ::google::cloud::beyondcorp_appconnections_v1_mocks::
-    MockAppConnectionsServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_MOCKS_MOCK_APP_CONNECTIONS_CONNECTION_H
diff --git a/google/cloud/beyondcorp/mocks/mock_app_connectors_connection.h b/google/cloud/beyondcorp/mocks/mock_app_connectors_connection.h
deleted file mode 100644
index c0c9e4c3ba6c7..0000000000000
--- a/google/cloud/beyondcorp/mocks/mock_app_connectors_connection.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_MOCKS_MOCK_APP_CONNECTORS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_MOCKS_MOCK_APP_CONNECTORS_CONNECTION_H
-
-#include "google/cloud/beyondcorp/app_connectors_connection.h"
-#include "google/cloud/beyondcorp/appconnectors/v1/mocks/mock_app_connectors_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in beyondcorp_appconnectors_v1_mocks instead of the
-///     aliases defined in this namespace.
-namespace beyondcorp_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appconnectors_v1_mocks::MockAppConnectorsServiceConnection
-/// directly.
-using ::google::cloud::beyondcorp_appconnectors_v1_mocks::
-    MockAppConnectorsServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_MOCKS_MOCK_APP_CONNECTORS_CONNECTION_H
diff --git a/google/cloud/beyondcorp/mocks/mock_app_gateways_connection.h b/google/cloud/beyondcorp/mocks/mock_app_gateways_connection.h
deleted file mode 100644
index d561b025cd2d4..0000000000000
--- a/google/cloud/beyondcorp/mocks/mock_app_gateways_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_MOCKS_MOCK_APP_GATEWAYS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_MOCKS_MOCK_APP_GATEWAYS_CONNECTION_H
-
-#include "google/cloud/beyondcorp/app_gateways_connection.h"
-#include "google/cloud/beyondcorp/appgateways/v1/mocks/mock_app_gateways_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in beyondcorp_appgateways_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace beyondcorp_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// beyondcorp_appgateways_v1_mocks::MockAppGatewaysServiceConnection directly.
-using ::google::cloud::beyondcorp_appgateways_v1_mocks::
-    MockAppGatewaysServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace beyondcorp_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BEYONDCORP_MOCKS_MOCK_APP_GATEWAYS_CONNECTION_H
diff --git a/google/cloud/bigquery/BUILD.bazel b/google/cloud/bigquery/BUILD.bazel
index 6ecb7ee049842..11484888b4822 100644
--- a/google/cloud/bigquery/BUILD.bazel
+++ b/google/cloud/bigquery/BUILD.bazel
@@ -23,7 +23,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "biglake/v1/",
     "analyticshub/v1/",
     "connection/v1/",
diff --git a/google/cloud/bigquery/analytics_hub_client.h b/google/cloud/bigquery/analytics_hub_client.h
deleted file mode 100644
index f5cca725c6ce2..0000000000000
--- a/google/cloud/bigquery/analytics_hub_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_CLIENT_H
-
-#include "google/cloud/bigquery/analytics_hub_connection.h"
-#include "google/cloud/bigquery/analyticshub/v1/analytics_hub_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_analyticshub_v1 instead of the aliases defined
-///     in this namespace.
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_analyticshub_v1::AnalyticsHubServiceClient
-/// directly.
-using ::google::cloud::bigquery_analyticshub_v1::AnalyticsHubServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_CLIENT_H
diff --git a/google/cloud/bigquery/analytics_hub_connection.h b/google/cloud/bigquery/analytics_hub_connection.h
deleted file mode 100644
index 4caa9a09b2a70..0000000000000
--- a/google/cloud/bigquery/analytics_hub_connection.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_CONNECTION_H
-
-#include "google/cloud/bigquery/analytics_hub_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/analyticshub/v1/analytics_hub_connection.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_analyticshub_v1::MakeAnalyticsHubServiceConnection
-/// directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    MakeAnalyticsHubServiceConnection;
-
-/// @deprecated Use bigquery_analyticshub_v1::AnalyticsHubServiceConnection
-/// directly.
-using ::google::cloud::bigquery_analyticshub_v1::AnalyticsHubServiceConnection;
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1::AnalyticsHubServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    AnalyticsHubServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1::AnalyticsHubServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    AnalyticsHubServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use bigquery_analyticshub_v1::AnalyticsHubServiceRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_analyticshub_v1::AnalyticsHubServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_CONNECTION_H
diff --git a/google/cloud/bigquery/analytics_hub_connection_idempotency_policy.h b/google/cloud/bigquery/analytics_hub_connection_idempotency_policy.h
deleted file mode 100644
index bb371e89fed4c..0000000000000
--- a/google/cloud/bigquery/analytics_hub_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/bigquery/analyticshub/v1/analytics_hub_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1::MakeDefaultAnalyticsHubServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    MakeDefaultAnalyticsHubServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1::AnalyticsHubServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    AnalyticsHubServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/analytics_hub_options.h b/google/cloud/bigquery/analytics_hub_options.h
deleted file mode 100644
index d538cdf852634..0000000000000
--- a/google/cloud/bigquery/analytics_hub_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_OPTIONS_H
-
-#include "google/cloud/bigquery/analytics_hub_connection.h"
-#include "google/cloud/bigquery/analytics_hub_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/analyticshub/v1/analytics_hub_options.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1::AnalyticsHubServicePollingPolicyOption directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    AnalyticsHubServicePollingPolicyOption;
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1::AnalyticsHubServiceBackoffPolicyOption directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    AnalyticsHubServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1::AnalyticsHubServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    AnalyticsHubServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1::AnalyticsHubServicePolicyOptionList directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    AnalyticsHubServicePolicyOptionList;
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1::AnalyticsHubServiceRetryPolicyOption directly.
-using ::google::cloud::bigquery_analyticshub_v1::
-    AnalyticsHubServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_ANALYTICS_HUB_OPTIONS_H
diff --git a/google/cloud/bigquery/bigquery_read_client.h b/google/cloud/bigquery/bigquery_read_client.h
deleted file mode 100644
index afffa9ded2bf5..0000000000000
--- a/google/cloud/bigquery/bigquery_read_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_CLIENT_H
-
-#include "google/cloud/bigquery/bigquery_read_connection.h"
-#include "google/cloud/bigquery/storage/v1/bigquery_read_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_storage_v1 instead of the aliases defined in
-///     this namespace.
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_storage_v1::BigQueryReadClient directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryReadClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_CLIENT_H
diff --git a/google/cloud/bigquery/bigquery_read_connection.h b/google/cloud/bigquery/bigquery_read_connection.h
deleted file mode 100644
index 6326dcfbd6369..0000000000000
--- a/google/cloud/bigquery/bigquery_read_connection.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_CONNECTION_H
-
-#include "google/cloud/bigquery/bigquery_read_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/storage/v1/bigquery_read_connection.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_storage_v1::MakeBigQueryReadConnection directly.
-using ::google::cloud::bigquery_storage_v1::MakeBigQueryReadConnection;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryReadConnection directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryReadConnection;
-
-/// @deprecated Use
-/// bigquery_storage_v1::BigQueryReadLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::bigquery_storage_v1::
-    BigQueryReadLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryReadLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryReadLimitedTimeRetryPolicy;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryReadRetryPolicy directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryReadRetryPolicy;
-
-GOOGLE_CLOUD_CPP_DEPRECATED(
-    "applications should not need this."
-    " Please file a bug at https://github.com/googleapis/google-cloud-cpp"
-    " if you do.")
-void BigQueryReadReadRowsStreamingUpdater(
-    google::cloud::bigquery::storage::v1::ReadRowsResponse const& response,
-    google::cloud::bigquery::storage::v1::ReadRowsRequest& request);
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_CONNECTION_H
diff --git a/google/cloud/bigquery/bigquery_read_connection_idempotency_policy.h b/google/cloud/bigquery/bigquery_read_connection_idempotency_policy.h
deleted file mode 100644
index f3dde2491de48..0000000000000
--- a/google/cloud/bigquery/bigquery_read_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/bigquery/storage/v1/bigquery_read_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_storage_v1::MakeDefaultBigQueryReadConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_storage_v1::
-    MakeDefaultBigQueryReadConnectionIdempotencyPolicy;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryReadConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_storage_v1::
-    BigQueryReadConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/bigquery_read_options.h b/google/cloud/bigquery/bigquery_read_options.h
deleted file mode 100644
index 264828d43bbd3..0000000000000
--- a/google/cloud/bigquery/bigquery_read_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_OPTIONS_H
-
-#include "google/cloud/bigquery/bigquery_read_connection.h"
-#include "google/cloud/bigquery/bigquery_read_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/storage/v1/bigquery_read_options.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_storage_v1::BigQueryReadBackoffPolicyOption
-/// directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryReadBackoffPolicyOption;
-
-/// @deprecated Use
-/// bigquery_storage_v1::BigQueryReadConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::bigquery_storage_v1::
-    BigQueryReadConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryReadPolicyOptionList directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryReadPolicyOptionList;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryReadRetryPolicyOption directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryReadRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_READ_OPTIONS_H
diff --git a/google/cloud/bigquery/bigquery_write_client.h b/google/cloud/bigquery/bigquery_write_client.h
deleted file mode 100644
index b28e7676cbe91..0000000000000
--- a/google/cloud/bigquery/bigquery_write_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_CLIENT_H
-
-#include "google/cloud/bigquery/bigquery_write_connection.h"
-#include "google/cloud/bigquery/storage/v1/bigquery_write_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_storage_v1 instead of the aliases defined in
-///     this namespace.
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_storage_v1::BigQueryWriteClient directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryWriteClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_CLIENT_H
diff --git a/google/cloud/bigquery/bigquery_write_connection.h b/google/cloud/bigquery/bigquery_write_connection.h
deleted file mode 100644
index 29be103d41960..0000000000000
--- a/google/cloud/bigquery/bigquery_write_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_CONNECTION_H
-
-#include "google/cloud/bigquery/bigquery_write_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/storage/v1/bigquery_write_connection.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_storage_v1::MakeBigQueryWriteConnection directly.
-using ::google::cloud::bigquery_storage_v1::MakeBigQueryWriteConnection;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryWriteConnection directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryWriteConnection;
-
-/// @deprecated Use
-/// bigquery_storage_v1::BigQueryWriteLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::bigquery_storage_v1::
-    BigQueryWriteLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryWriteLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryWriteLimitedTimeRetryPolicy;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryWriteRetryPolicy directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryWriteRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_CONNECTION_H
diff --git a/google/cloud/bigquery/bigquery_write_connection_idempotency_policy.h b/google/cloud/bigquery/bigquery_write_connection_idempotency_policy.h
deleted file mode 100644
index e13b586bd34d4..0000000000000
--- a/google/cloud/bigquery/bigquery_write_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/bigquery/storage/v1/bigquery_write_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_storage_v1::MakeDefaultBigQueryWriteConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_storage_v1::
-    MakeDefaultBigQueryWriteConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// bigquery_storage_v1::BigQueryWriteConnectionIdempotencyPolicy directly.
-using ::google::cloud::bigquery_storage_v1::
-    BigQueryWriteConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/bigquery_write_options.h b/google/cloud/bigquery/bigquery_write_options.h
deleted file mode 100644
index 7f30a3b330713..0000000000000
--- a/google/cloud/bigquery/bigquery_write_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_OPTIONS_H
-
-#include "google/cloud/bigquery/bigquery_write_connection.h"
-#include "google/cloud/bigquery/bigquery_write_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/storage/v1/bigquery_write_options.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_storage_v1::BigQueryWriteBackoffPolicyOption
-/// directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryWriteBackoffPolicyOption;
-
-/// @deprecated Use
-/// bigquery_storage_v1::BigQueryWriteConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::bigquery_storage_v1::
-    BigQueryWriteConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryWritePolicyOptionList directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryWritePolicyOptionList;
-
-/// @deprecated Use bigquery_storage_v1::BigQueryWriteRetryPolicyOption
-/// directly.
-using ::google::cloud::bigquery_storage_v1::BigQueryWriteRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_BIGQUERY_WRITE_OPTIONS_H
diff --git a/google/cloud/bigquery/connection_client.h b/google/cloud/bigquery/connection_client.h
deleted file mode 100644
index 21f69cb895166..0000000000000
--- a/google/cloud/bigquery/connection_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/connection/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_CLIENT_H
-
-#include "google/cloud/bigquery/connection/v1/connection_client.h"
-#include "google/cloud/bigquery/connection_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_connection_v1 instead of the aliases defined
-///     in this namespace.
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_connection_v1::ConnectionServiceClient directly.
-using ::google::cloud::bigquery_connection_v1::ConnectionServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_CLIENT_H
diff --git a/google/cloud/bigquery/connection_connection.h b/google/cloud/bigquery/connection_connection.h
deleted file mode 100644
index 2c73c22664d3a..0000000000000
--- a/google/cloud/bigquery/connection_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/connection/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_CONNECTION_H
-
-#include "google/cloud/bigquery/connection/v1/connection_connection.h"
-#include "google/cloud/bigquery/connection_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_connection_v1::MakeConnectionServiceConnection
-/// directly.
-using ::google::cloud::bigquery_connection_v1::MakeConnectionServiceConnection;
-
-/// @deprecated Use bigquery_connection_v1::ConnectionServiceConnection
-/// directly.
-using ::google::cloud::bigquery_connection_v1::ConnectionServiceConnection;
-
-/// @deprecated Use
-/// bigquery_connection_v1::ConnectionServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_connection_v1::
-    ConnectionServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// bigquery_connection_v1::ConnectionServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::bigquery_connection_v1::
-    ConnectionServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use bigquery_connection_v1::ConnectionServiceRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_connection_v1::ConnectionServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_CONNECTION_H
diff --git a/google/cloud/bigquery/connection_connection_idempotency_policy.h b/google/cloud/bigquery/connection_connection_idempotency_policy.h
deleted file mode 100644
index 79752b579c3d1..0000000000000
--- a/google/cloud/bigquery/connection_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/connection/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/bigquery/connection/v1/connection_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_connection_v1::MakeDefaultConnectionServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_connection_v1::
-    MakeDefaultConnectionServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// bigquery_connection_v1::ConnectionServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_connection_v1::
-    ConnectionServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/connection_options.h b/google/cloud/bigquery/connection_options.h
deleted file mode 100644
index c580429e52d15..0000000000000
--- a/google/cloud/bigquery/connection_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/connection/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_OPTIONS_H
-
-#include "google/cloud/bigquery/connection/v1/connection_options.h"
-#include "google/cloud/bigquery/connection_connection.h"
-#include "google/cloud/bigquery/connection_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_connection_v1::ConnectionServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::bigquery_connection_v1::
-    ConnectionServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// bigquery_connection_v1::ConnectionServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::bigquery_connection_v1::
-    ConnectionServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use bigquery_connection_v1::ConnectionServicePolicyOptionList
-/// directly.
-using ::google::cloud::bigquery_connection_v1::
-    ConnectionServicePolicyOptionList;
-
-/// @deprecated Use bigquery_connection_v1::ConnectionServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::bigquery_connection_v1::
-    ConnectionServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_CONNECTION_OPTIONS_H
diff --git a/google/cloud/bigquery/data_policy_client.h b/google/cloud/bigquery/data_policy_client.h
deleted file mode 100644
index c0d2074140d9a..0000000000000
--- a/google/cloud/bigquery/data_policy_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_CLIENT_H
-
-#include "google/cloud/bigquery/data_policy_connection.h"
-#include "google/cloud/bigquery/datapolicies/v1/data_policy_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_datapolicies_v1 instead of the aliases defined
-///     in this namespace.
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_datapolicies_v1::DataPolicyServiceClient directly.
-using ::google::cloud::bigquery_datapolicies_v1::DataPolicyServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_CLIENT_H
diff --git a/google/cloud/bigquery/data_policy_connection.h b/google/cloud/bigquery/data_policy_connection.h
deleted file mode 100644
index aa62574b3a4ca..0000000000000
--- a/google/cloud/bigquery/data_policy_connection.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_CONNECTION_H
-
-#include "google/cloud/bigquery/data_policy_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/datapolicies/v1/data_policy_connection.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_datapolicies_v1::MakeDataPolicyServiceConnection
-/// directly.
-using ::google::cloud::bigquery_datapolicies_v1::
-    MakeDataPolicyServiceConnection;
-
-/// @deprecated Use bigquery_datapolicies_v1::DataPolicyServiceConnection
-/// directly.
-using ::google::cloud::bigquery_datapolicies_v1::DataPolicyServiceConnection;
-
-/// @deprecated Use
-/// bigquery_datapolicies_v1::DataPolicyServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_datapolicies_v1::
-    DataPolicyServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// bigquery_datapolicies_v1::DataPolicyServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::bigquery_datapolicies_v1::
-    DataPolicyServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use bigquery_datapolicies_v1::DataPolicyServiceRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_datapolicies_v1::DataPolicyServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_CONNECTION_H
diff --git a/google/cloud/bigquery/data_policy_connection_idempotency_policy.h b/google/cloud/bigquery/data_policy_connection_idempotency_policy.h
deleted file mode 100644
index 7fef76f061bb9..0000000000000
--- a/google/cloud/bigquery/data_policy_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/bigquery/datapolicies/v1/data_policy_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_datapolicies_v1::MakeDefaultDataPolicyServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_datapolicies_v1::
-    MakeDefaultDataPolicyServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// bigquery_datapolicies_v1::DataPolicyServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_datapolicies_v1::
-    DataPolicyServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/data_policy_options.h b/google/cloud/bigquery/data_policy_options.h
deleted file mode 100644
index 4bab36ae5d024..0000000000000
--- a/google/cloud/bigquery/data_policy_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_OPTIONS_H
-
-#include "google/cloud/bigquery/data_policy_connection.h"
-#include "google/cloud/bigquery/data_policy_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/datapolicies/v1/data_policy_options.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_datapolicies_v1::DataPolicyServiceBackoffPolicyOption directly.
-using ::google::cloud::bigquery_datapolicies_v1::
-    DataPolicyServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// bigquery_datapolicies_v1::DataPolicyServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::bigquery_datapolicies_v1::
-    DataPolicyServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use bigquery_datapolicies_v1::DataPolicyServicePolicyOptionList
-/// directly.
-using ::google::cloud::bigquery_datapolicies_v1::
-    DataPolicyServicePolicyOptionList;
-
-/// @deprecated Use bigquery_datapolicies_v1::DataPolicyServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::bigquery_datapolicies_v1::
-    DataPolicyServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_POLICY_OPTIONS_H
diff --git a/google/cloud/bigquery/data_transfer_client.h b/google/cloud/bigquery/data_transfer_client.h
deleted file mode 100644
index 36d8f6b559544..0000000000000
--- a/google/cloud/bigquery/data_transfer_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CLIENT_H
-
-#include "google/cloud/bigquery/data_transfer_connection.h"
-#include "google/cloud/bigquery/datatransfer/v1/data_transfer_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_datatransfer_v1 instead of the aliases defined
-///     in this namespace.
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_datatransfer_v1::DataTransferServiceClient
-/// directly.
-using ::google::cloud::bigquery_datatransfer_v1::DataTransferServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CLIENT_H
diff --git a/google/cloud/bigquery/data_transfer_connection.h b/google/cloud/bigquery/data_transfer_connection.h
deleted file mode 100644
index 77ae9f1b1c8d8..0000000000000
--- a/google/cloud/bigquery/data_transfer_connection.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_H
-
-#include "google/cloud/bigquery/data_transfer_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_datatransfer_v1::MakeDataTransferServiceConnection
-/// directly.
-using ::google::cloud::bigquery_datatransfer_v1::
-    MakeDataTransferServiceConnection;
-
-/// @deprecated Use bigquery_datatransfer_v1::DataTransferServiceConnection
-/// directly.
-using ::google::cloud::bigquery_datatransfer_v1::DataTransferServiceConnection;
-
-/// @deprecated Use
-/// bigquery_datatransfer_v1::DataTransferServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_datatransfer_v1::
-    DataTransferServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// bigquery_datatransfer_v1::DataTransferServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_datatransfer_v1::
-    DataTransferServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use bigquery_datatransfer_v1::DataTransferServiceRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_datatransfer_v1::DataTransferServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_H
diff --git a/google/cloud/bigquery/data_transfer_connection_idempotency_policy.h b/google/cloud/bigquery/data_transfer_connection_idempotency_policy.h
deleted file mode 100644
index f84d3426b2e4e..0000000000000
--- a/google/cloud/bigquery/data_transfer_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_datatransfer_v1::MakeDefaultDataTransferServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_datatransfer_v1::
-    MakeDefaultDataTransferServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// bigquery_datatransfer_v1::DataTransferServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_datatransfer_v1::
-    DataTransferServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/data_transfer_options.h b/google/cloud/bigquery/data_transfer_options.h
deleted file mode 100644
index d930f6ff84c61..0000000000000
--- a/google/cloud/bigquery/data_transfer_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_OPTIONS_H
-
-#include "google/cloud/bigquery/data_transfer_connection.h"
-#include "google/cloud/bigquery/data_transfer_connection_idempotency_policy.h"
-#include "google/cloud/bigquery/datatransfer/v1/data_transfer_options.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_datatransfer_v1::DataTransferServiceBackoffPolicyOption directly.
-using ::google::cloud::bigquery_datatransfer_v1::
-    DataTransferServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// bigquery_datatransfer_v1::DataTransferServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::bigquery_datatransfer_v1::
-    DataTransferServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// bigquery_datatransfer_v1::DataTransferServicePolicyOptionList directly.
-using ::google::cloud::bigquery_datatransfer_v1::
-    DataTransferServicePolicyOptionList;
-
-/// @deprecated Use
-/// bigquery_datatransfer_v1::DataTransferServiceRetryPolicyOption directly.
-using ::google::cloud::bigquery_datatransfer_v1::
-    DataTransferServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_OPTIONS_H
diff --git a/google/cloud/bigquery/migration_client.h b/google/cloud/bigquery/migration_client.h
deleted file mode 100644
index ddeb5a5877875..0000000000000
--- a/google/cloud/bigquery/migration_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/migration/v2/migration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_CLIENT_H
-
-#include "google/cloud/bigquery/migration/v2/migration_client.h"
-#include "google/cloud/bigquery/migration_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_migration_v2 instead of the aliases defined in
-///     this namespace.
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_migration_v2::MigrationServiceClient directly.
-using ::google::cloud::bigquery_migration_v2::MigrationServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_CLIENT_H
diff --git a/google/cloud/bigquery/migration_connection.h b/google/cloud/bigquery/migration_connection.h
deleted file mode 100644
index 032b87776d156..0000000000000
--- a/google/cloud/bigquery/migration_connection.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/migration/v2/migration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_CONNECTION_H
-
-#include "google/cloud/bigquery/migration/v2/migration_connection.h"
-#include "google/cloud/bigquery/migration_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_migration_v2::MakeMigrationServiceConnection
-/// directly.
-using ::google::cloud::bigquery_migration_v2::MakeMigrationServiceConnection;
-
-/// @deprecated Use bigquery_migration_v2::MigrationServiceConnection directly.
-using ::google::cloud::bigquery_migration_v2::MigrationServiceConnection;
-
-/// @deprecated Use
-/// bigquery_migration_v2::MigrationServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_migration_v2::
-    MigrationServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// bigquery_migration_v2::MigrationServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::bigquery_migration_v2::
-    MigrationServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use bigquery_migration_v2::MigrationServiceRetryPolicy directly.
-using ::google::cloud::bigquery_migration_v2::MigrationServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_CONNECTION_H
diff --git a/google/cloud/bigquery/migration_connection_idempotency_policy.h b/google/cloud/bigquery/migration_connection_idempotency_policy.h
deleted file mode 100644
index 9cd1ebba3427c..0000000000000
--- a/google/cloud/bigquery/migration_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/migration/v2/migration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/bigquery/migration/v2/migration_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_migration_v2::MakeDefaultMigrationServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_migration_v2::
-    MakeDefaultMigrationServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// bigquery_migration_v2::MigrationServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::bigquery_migration_v2::
-    MigrationServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/migration_options.h b/google/cloud/bigquery/migration_options.h
deleted file mode 100644
index 80488f99b8bb1..0000000000000
--- a/google/cloud/bigquery/migration_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/migration/v2/migration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_OPTIONS_H
-
-#include "google/cloud/bigquery/migration/v2/migration_options.h"
-#include "google/cloud/bigquery/migration_connection.h"
-#include "google/cloud/bigquery/migration_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_migration_v2::MigrationServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::bigquery_migration_v2::
-    MigrationServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// bigquery_migration_v2::MigrationServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::bigquery_migration_v2::
-    MigrationServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use bigquery_migration_v2::MigrationServicePolicyOptionList
-/// directly.
-using ::google::cloud::bigquery_migration_v2::MigrationServicePolicyOptionList;
-
-/// @deprecated Use bigquery_migration_v2::MigrationServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::bigquery_migration_v2::MigrationServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MIGRATION_OPTIONS_H
diff --git a/google/cloud/bigquery/mocks/mock_analytics_hub_connection.h b/google/cloud/bigquery/mocks/mock_analytics_hub_connection.h
deleted file mode 100644
index e69d6fede475e..0000000000000
--- a/google/cloud/bigquery/mocks/mock_analytics_hub_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/analyticshub/v1/analyticshub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_ANALYTICS_HUB_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_ANALYTICS_HUB_CONNECTION_H
-
-#include "google/cloud/bigquery/analytics_hub_connection.h"
-#include "google/cloud/bigquery/analyticshub/v1/mocks/mock_analytics_hub_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_analyticshub_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace bigquery_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_analyticshub_v1_mocks::MockAnalyticsHubServiceConnection directly.
-using ::google::cloud::bigquery_analyticshub_v1_mocks::
-    MockAnalyticsHubServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_ANALYTICS_HUB_CONNECTION_H
diff --git a/google/cloud/bigquery/mocks/mock_bigquery_read_connection.h b/google/cloud/bigquery/mocks/mock_bigquery_read_connection.h
deleted file mode 100644
index 19685608ebd11..0000000000000
--- a/google/cloud/bigquery/mocks/mock_bigquery_read_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_BIGQUERY_READ_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_BIGQUERY_READ_CONNECTION_H
-
-#include "google/cloud/bigquery/bigquery_read_connection.h"
-#include "google/cloud/bigquery/storage/v1/mocks/mock_bigquery_read_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_storage_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace bigquery_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_storage_v1_mocks::MockBigQueryReadConnection
-/// directly.
-using ::google::cloud::bigquery_storage_v1_mocks::MockBigQueryReadConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_BIGQUERY_READ_CONNECTION_H
diff --git a/google/cloud/bigquery/mocks/mock_bigquery_write_connection.h b/google/cloud/bigquery/mocks/mock_bigquery_write_connection.h
deleted file mode 100644
index 3354e6212f6ba..0000000000000
--- a/google/cloud/bigquery/mocks/mock_bigquery_write_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/storage/v1/storage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_BIGQUERY_WRITE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_BIGQUERY_WRITE_CONNECTION_H
-
-#include "google/cloud/bigquery/bigquery_write_connection.h"
-#include "google/cloud/bigquery/storage/v1/mocks/mock_bigquery_write_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_storage_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace bigquery_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_storage_v1_mocks::MockBigQueryWriteConnection
-/// directly.
-using ::google::cloud::bigquery_storage_v1_mocks::MockBigQueryWriteConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_BIGQUERY_WRITE_CONNECTION_H
diff --git a/google/cloud/bigquery/mocks/mock_connection_connection.h b/google/cloud/bigquery/mocks/mock_connection_connection.h
deleted file mode 100644
index e21493a15f07e..0000000000000
--- a/google/cloud/bigquery/mocks/mock_connection_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/connection/v1/connection.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_CONNECTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_CONNECTION_CONNECTION_H
-
-#include "google/cloud/bigquery/connection/v1/mocks/mock_connection_connection.h"
-#include "google/cloud/bigquery/connection_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_connection_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace bigquery_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_connection_v1_mocks::MockConnectionServiceConnection directly.
-using ::google::cloud::bigquery_connection_v1_mocks::
-    MockConnectionServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_CONNECTION_CONNECTION_H
diff --git a/google/cloud/bigquery/mocks/mock_data_policy_connection.h b/google/cloud/bigquery/mocks/mock_data_policy_connection.h
deleted file mode 100644
index 13f5c5e84f1ae..0000000000000
--- a/google/cloud/bigquery/mocks/mock_data_policy_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datapolicies/v1/datapolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_DATA_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_DATA_POLICY_CONNECTION_H
-
-#include "google/cloud/bigquery/data_policy_connection.h"
-#include "google/cloud/bigquery/datapolicies/v1/mocks/mock_data_policy_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_datapolicies_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace bigquery_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_datapolicies_v1_mocks::MockDataPolicyServiceConnection directly.
-using ::google::cloud::bigquery_datapolicies_v1_mocks::
-    MockDataPolicyServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_DATA_POLICY_CONNECTION_H
diff --git a/google/cloud/bigquery/mocks/mock_data_transfer_connection.h b/google/cloud/bigquery/mocks/mock_data_transfer_connection.h
deleted file mode 100644
index 5be1967395f73..0000000000000
--- a/google/cloud/bigquery/mocks/mock_data_transfer_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_DATA_TRANSFER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_DATA_TRANSFER_CONNECTION_H
-
-#include "google/cloud/bigquery/data_transfer_connection.h"
-#include "google/cloud/bigquery/datatransfer/v1/mocks/mock_data_transfer_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_datatransfer_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace bigquery_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_datatransfer_v1_mocks::MockDataTransferServiceConnection directly.
-using ::google::cloud::bigquery_datatransfer_v1_mocks::
-    MockDataTransferServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_DATA_TRANSFER_CONNECTION_H
diff --git a/google/cloud/bigquery/mocks/mock_migration_connection.h b/google/cloud/bigquery/mocks/mock_migration_connection.h
deleted file mode 100644
index 3ebd20884864b..0000000000000
--- a/google/cloud/bigquery/mocks/mock_migration_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/migration/v2/migration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_MIGRATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_MIGRATION_CONNECTION_H
-
-#include "google/cloud/bigquery/migration/v2/mocks/mock_migration_connection.h"
-#include "google/cloud/bigquery/migration_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_migration_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace bigquery_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_migration_v2_mocks::MockMigrationServiceConnection
-/// directly.
-using ::google::cloud::bigquery_migration_v2_mocks::
-    MockMigrationServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_MIGRATION_CONNECTION_H
diff --git a/google/cloud/bigquery/mocks/mock_reservation_connection.h b/google/cloud/bigquery/mocks/mock_reservation_connection.h
deleted file mode 100644
index 59193794e893f..0000000000000
--- a/google/cloud/bigquery/mocks/mock_reservation_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/reservation/v1/reservation.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_RESERVATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_RESERVATION_CONNECTION_H
-
-#include "google/cloud/bigquery/reservation/v1/mocks/mock_reservation_connection.h"
-#include "google/cloud/bigquery/reservation_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_reservation_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace bigquery_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_reservation_v1_mocks::MockReservationServiceConnection directly.
-using ::google::cloud::bigquery_reservation_v1_mocks::
-    MockReservationServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_RESERVATION_CONNECTION_H
diff --git a/google/cloud/bigquery/reservation_client.h b/google/cloud/bigquery/reservation_client.h
deleted file mode 100644
index a728f4643c7b2..0000000000000
--- a/google/cloud/bigquery/reservation_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/reservation/v1/reservation.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CLIENT_H
-
-#include "google/cloud/bigquery/reservation/v1/reservation_client.h"
-#include "google/cloud/bigquery/reservation_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in bigquery_reservation_v1 instead of the aliases defined
-///     in this namespace.
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_reservation_v1::ReservationServiceClient directly.
-using ::google::cloud::bigquery_reservation_v1::ReservationServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CLIENT_H
diff --git a/google/cloud/bigquery/reservation_connection.h b/google/cloud/bigquery/reservation_connection.h
deleted file mode 100644
index 40bde54134e36..0000000000000
--- a/google/cloud/bigquery/reservation_connection.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/reservation/v1/reservation.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_H
-
-#include "google/cloud/bigquery/reservation/v1/reservation_connection.h"
-#include "google/cloud/bigquery/reservation_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use bigquery_reservation_v1::MakeReservationServiceConnection
-/// directly.
-using ::google::cloud::bigquery_reservation_v1::
-    MakeReservationServiceConnection;
-
-/// @deprecated Use bigquery_reservation_v1::ReservationServiceConnection
-/// directly.
-using ::google::cloud::bigquery_reservation_v1::ReservationServiceConnection;
-
-/// @deprecated Use
-/// bigquery_reservation_v1::ReservationServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_reservation_v1::
-    ReservationServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// bigquery_reservation_v1::ReservationServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::bigquery_reservation_v1::
-    ReservationServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use bigquery_reservation_v1::ReservationServiceRetryPolicy
-/// directly.
-using ::google::cloud::bigquery_reservation_v1::ReservationServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_H
diff --git a/google/cloud/bigquery/reservation_connection_idempotency_policy.h b/google/cloud/bigquery/reservation_connection_idempotency_policy.h
deleted file mode 100644
index 2a1982ec17c4b..0000000000000
--- a/google/cloud/bigquery/reservation_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/reservation/v1/reservation.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_reservation_v1::MakeDefaultReservationServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_reservation_v1::
-    MakeDefaultReservationServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// bigquery_reservation_v1::ReservationServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::bigquery_reservation_v1::
-    ReservationServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/reservation_options.h b/google/cloud/bigquery/reservation_options.h
deleted file mode 100644
index 6c3e565432c51..0000000000000
--- a/google/cloud/bigquery/reservation_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/bigquery/reservation/v1/reservation.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_OPTIONS_H
-
-#include "google/cloud/bigquery/reservation/v1/reservation_options.h"
-#include "google/cloud/bigquery/reservation_connection.h"
-#include "google/cloud/bigquery/reservation_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// bigquery_reservation_v1::ReservationServiceBackoffPolicyOption directly.
-using ::google::cloud::bigquery_reservation_v1::
-    ReservationServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// bigquery_reservation_v1::ReservationServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::bigquery_reservation_v1::
-    ReservationServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use bigquery_reservation_v1::ReservationServicePolicyOptionList
-/// directly.
-using ::google::cloud::bigquery_reservation_v1::
-    ReservationServicePolicyOptionList;
-
-/// @deprecated Use bigquery_reservation_v1::ReservationServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::bigquery_reservation_v1::
-    ReservationServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_OPTIONS_H
diff --git a/google/cloud/bigquery/storage/v1/bigquery_read_connection.cc b/google/cloud/bigquery/storage/v1/bigquery_read_connection.cc
index 9435c6475456d..ac0e222eac708 100644
--- a/google/cloud/bigquery/storage/v1/bigquery_read_connection.cc
+++ b/google/cloud/bigquery/storage/v1/bigquery_read_connection.cc
@@ -82,20 +82,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_storage_v1
 }  // namespace cloud
 }  // namespace google
-
-namespace google {
-namespace cloud {
-namespace bigquery {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-void BigQueryReadReadRowsStreamingUpdater(
-    google::cloud::bigquery::storage::v1::ReadRowsResponse const& response,
-    google::cloud::bigquery::storage::v1::ReadRowsRequest& request) {
-  return bigquery_storage_v1_internal::BigQueryReadReadRowsStreamingUpdater(
-      response, request);
-}
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace bigquery
-}  // namespace cloud
-}  // namespace google
diff --git a/google/cloud/billing/BUILD.bazel b/google/cloud/billing/BUILD.bazel
index 69172d552ab62..a738595faabcb 100644
--- a/google/cloud/billing/BUILD.bazel
+++ b/google/cloud/billing/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "budgets/v1/",
     "v1/",
 ]
diff --git a/google/cloud/billing/CMakeLists.txt b/google/cloud/billing/CMakeLists.txt
index 014d0885e573e..8ac700b8ff4ba 100644
--- a/google/cloud/billing/CMakeLists.txt
+++ b/google/cloud/billing/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(billing "Cloud Billing Budget API"
-                                   SERVICE_DIRS "__EMPTY__" "budgets/v1/" "v1/")
+                                   SERVICE_DIRS "budgets/v1/" "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(billing_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/billing/budget_client.h b/google/cloud/billing/budget_client.h
deleted file mode 100644
index 216e388a8ec26..0000000000000
--- a/google/cloud/billing/budget_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/budgets/v1/budget_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_CLIENT_H
-
-#include "google/cloud/billing/budget_connection.h"
-#include "google/cloud/billing/budgets/v1/budget_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in billing_budgets_v1 instead of the aliases defined in
-///     this namespace.
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_budgets_v1::BudgetServiceClient directly.
-using ::google::cloud::billing_budgets_v1::BudgetServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_CLIENT_H
diff --git a/google/cloud/billing/budget_connection.h b/google/cloud/billing/budget_connection.h
deleted file mode 100644
index 66958694a6c5f..0000000000000
--- a/google/cloud/billing/budget_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/budgets/v1/budget_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_CONNECTION_H
-
-#include "google/cloud/billing/budget_connection_idempotency_policy.h"
-#include "google/cloud/billing/budgets/v1/budget_connection.h"
-
-namespace google {
-namespace cloud {
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_budgets_v1::MakeBudgetServiceConnection directly.
-using ::google::cloud::billing_budgets_v1::MakeBudgetServiceConnection;
-
-/// @deprecated Use billing_budgets_v1::BudgetServiceConnection directly.
-using ::google::cloud::billing_budgets_v1::BudgetServiceConnection;
-
-/// @deprecated Use
-/// billing_budgets_v1::BudgetServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::billing_budgets_v1::
-    BudgetServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use billing_budgets_v1::BudgetServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::billing_budgets_v1::BudgetServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use billing_budgets_v1::BudgetServiceRetryPolicy directly.
-using ::google::cloud::billing_budgets_v1::BudgetServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_CONNECTION_H
diff --git a/google/cloud/billing/budget_connection_idempotency_policy.h b/google/cloud/billing/budget_connection_idempotency_policy.h
deleted file mode 100644
index 79c37d9b2e6f1..0000000000000
--- a/google/cloud/billing/budget_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/budgets/v1/budget_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/billing/budgets/v1/budget_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// billing_budgets_v1::MakeDefaultBudgetServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::billing_budgets_v1::
-    MakeDefaultBudgetServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use billing_budgets_v1::BudgetServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::billing_budgets_v1::
-    BudgetServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/billing/budget_options.h b/google/cloud/billing/budget_options.h
deleted file mode 100644
index 8038768056d47..0000000000000
--- a/google/cloud/billing/budget_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/budgets/v1/budget_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_OPTIONS_H
-
-#include "google/cloud/billing/budget_connection.h"
-#include "google/cloud/billing/budget_connection_idempotency_policy.h"
-#include "google/cloud/billing/budgets/v1/budget_options.h"
-
-namespace google {
-namespace cloud {
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_budgets_v1::BudgetServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::billing_budgets_v1::BudgetServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// billing_budgets_v1::BudgetServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::billing_budgets_v1::
-    BudgetServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use billing_budgets_v1::BudgetServicePolicyOptionList directly.
-using ::google::cloud::billing_budgets_v1::BudgetServicePolicyOptionList;
-
-/// @deprecated Use billing_budgets_v1::BudgetServiceRetryPolicyOption directly.
-using ::google::cloud::billing_budgets_v1::BudgetServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_BUDGET_OPTIONS_H
diff --git a/google/cloud/billing/cloud_billing_client.h b/google/cloud/billing/cloud_billing_client.h
deleted file mode 100644
index 39dea22fa0fb7..0000000000000
--- a/google/cloud/billing/cloud_billing_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_billing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_CLIENT_H
-
-#include "google/cloud/billing/cloud_billing_connection.h"
-#include "google/cloud/billing/v1/cloud_billing_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in billing_v1 instead of the aliases defined in
-///     this namespace.
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_v1::CloudBillingClient directly.
-using ::google::cloud::billing_v1::CloudBillingClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_CLIENT_H
diff --git a/google/cloud/billing/cloud_billing_connection.h b/google/cloud/billing/cloud_billing_connection.h
deleted file mode 100644
index b0829a151de2c..0000000000000
--- a/google/cloud/billing/cloud_billing_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_billing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_CONNECTION_H
-
-#include "google/cloud/billing/cloud_billing_connection_idempotency_policy.h"
-#include "google/cloud/billing/v1/cloud_billing_connection.h"
-
-namespace google {
-namespace cloud {
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_v1::MakeCloudBillingConnection directly.
-using ::google::cloud::billing_v1::MakeCloudBillingConnection;
-
-/// @deprecated Use billing_v1::CloudBillingConnection directly.
-using ::google::cloud::billing_v1::CloudBillingConnection;
-
-/// @deprecated Use billing_v1::CloudBillingLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::billing_v1::CloudBillingLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use billing_v1::CloudBillingLimitedTimeRetryPolicy directly.
-using ::google::cloud::billing_v1::CloudBillingLimitedTimeRetryPolicy;
-
-/// @deprecated Use billing_v1::CloudBillingRetryPolicy directly.
-using ::google::cloud::billing_v1::CloudBillingRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_CONNECTION_H
diff --git a/google/cloud/billing/cloud_billing_connection_idempotency_policy.h b/google/cloud/billing/cloud_billing_connection_idempotency_policy.h
deleted file mode 100644
index 8f3185afecc72..0000000000000
--- a/google/cloud/billing/cloud_billing_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_billing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/billing/v1/cloud_billing_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// billing_v1::MakeDefaultCloudBillingConnectionIdempotencyPolicy directly.
-using ::google::cloud::billing_v1::
-    MakeDefaultCloudBillingConnectionIdempotencyPolicy;
-
-/// @deprecated Use billing_v1::CloudBillingConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::billing_v1::CloudBillingConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/billing/cloud_billing_options.h b/google/cloud/billing/cloud_billing_options.h
deleted file mode 100644
index fd9e31b43c77e..0000000000000
--- a/google/cloud/billing/cloud_billing_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_billing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_OPTIONS_H
-
-#include "google/cloud/billing/cloud_billing_connection.h"
-#include "google/cloud/billing/cloud_billing_connection_idempotency_policy.h"
-#include "google/cloud/billing/v1/cloud_billing_options.h"
-
-namespace google {
-namespace cloud {
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_v1::CloudBillingBackoffPolicyOption directly.
-using ::google::cloud::billing_v1::CloudBillingBackoffPolicyOption;
-
-/// @deprecated Use billing_v1::CloudBillingConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::billing_v1::
-    CloudBillingConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use billing_v1::CloudBillingPolicyOptionList directly.
-using ::google::cloud::billing_v1::CloudBillingPolicyOptionList;
-
-/// @deprecated Use billing_v1::CloudBillingRetryPolicyOption directly.
-using ::google::cloud::billing_v1::CloudBillingRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_BILLING_OPTIONS_H
diff --git a/google/cloud/billing/cloud_catalog_client.h b/google/cloud/billing/cloud_catalog_client.h
deleted file mode 100644
index bc124b21808e8..0000000000000
--- a/google/cloud/billing/cloud_catalog_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_catalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_CLIENT_H
-
-#include "google/cloud/billing/cloud_catalog_connection.h"
-#include "google/cloud/billing/v1/cloud_catalog_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in billing_v1 instead of the aliases defined in
-///     this namespace.
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_v1::CloudCatalogClient directly.
-using ::google::cloud::billing_v1::CloudCatalogClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_CLIENT_H
diff --git a/google/cloud/billing/cloud_catalog_connection.h b/google/cloud/billing/cloud_catalog_connection.h
deleted file mode 100644
index 649278f5d4f05..0000000000000
--- a/google/cloud/billing/cloud_catalog_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_catalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_CONNECTION_H
-
-#include "google/cloud/billing/cloud_catalog_connection_idempotency_policy.h"
-#include "google/cloud/billing/v1/cloud_catalog_connection.h"
-
-namespace google {
-namespace cloud {
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_v1::MakeCloudCatalogConnection directly.
-using ::google::cloud::billing_v1::MakeCloudCatalogConnection;
-
-/// @deprecated Use billing_v1::CloudCatalogConnection directly.
-using ::google::cloud::billing_v1::CloudCatalogConnection;
-
-/// @deprecated Use billing_v1::CloudCatalogLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::billing_v1::CloudCatalogLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use billing_v1::CloudCatalogLimitedTimeRetryPolicy directly.
-using ::google::cloud::billing_v1::CloudCatalogLimitedTimeRetryPolicy;
-
-/// @deprecated Use billing_v1::CloudCatalogRetryPolicy directly.
-using ::google::cloud::billing_v1::CloudCatalogRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_CONNECTION_H
diff --git a/google/cloud/billing/cloud_catalog_connection_idempotency_policy.h b/google/cloud/billing/cloud_catalog_connection_idempotency_policy.h
deleted file mode 100644
index a3d6c4f493620..0000000000000
--- a/google/cloud/billing/cloud_catalog_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_catalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/billing/v1/cloud_catalog_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// billing_v1::MakeDefaultCloudCatalogConnectionIdempotencyPolicy directly.
-using ::google::cloud::billing_v1::
-    MakeDefaultCloudCatalogConnectionIdempotencyPolicy;
-
-/// @deprecated Use billing_v1::CloudCatalogConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::billing_v1::CloudCatalogConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/billing/cloud_catalog_options.h b/google/cloud/billing/cloud_catalog_options.h
deleted file mode 100644
index 9a62295230c2b..0000000000000
--- a/google/cloud/billing/cloud_catalog_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_catalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_OPTIONS_H
-
-#include "google/cloud/billing/cloud_catalog_connection.h"
-#include "google/cloud/billing/cloud_catalog_connection_idempotency_policy.h"
-#include "google/cloud/billing/v1/cloud_catalog_options.h"
-
-namespace google {
-namespace cloud {
-namespace billing {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_v1::CloudCatalogBackoffPolicyOption directly.
-using ::google::cloud::billing_v1::CloudCatalogBackoffPolicyOption;
-
-/// @deprecated Use billing_v1::CloudCatalogConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::billing_v1::
-    CloudCatalogConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use billing_v1::CloudCatalogPolicyOptionList directly.
-using ::google::cloud::billing_v1::CloudCatalogPolicyOptionList;
-
-/// @deprecated Use billing_v1::CloudCatalogRetryPolicyOption directly.
-using ::google::cloud::billing_v1::CloudCatalogRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_CLOUD_CATALOG_OPTIONS_H
diff --git a/google/cloud/billing/mocks/mock_budget_connection.h b/google/cloud/billing/mocks/mock_budget_connection.h
deleted file mode 100644
index fe60dacd761d3..0000000000000
--- a/google/cloud/billing/mocks/mock_budget_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/budgets/v1/budget_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_MOCKS_MOCK_BUDGET_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_MOCKS_MOCK_BUDGET_CONNECTION_H
-
-#include "google/cloud/billing/budget_connection.h"
-#include "google/cloud/billing/budgets/v1/mocks/mock_budget_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in billing_budgets_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace billing_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_budgets_v1_mocks::MockBudgetServiceConnection
-/// directly.
-using ::google::cloud::billing_budgets_v1_mocks::MockBudgetServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_MOCKS_MOCK_BUDGET_CONNECTION_H
diff --git a/google/cloud/billing/mocks/mock_cloud_billing_connection.h b/google/cloud/billing/mocks/mock_cloud_billing_connection.h
deleted file mode 100644
index 0ae5e447d704a..0000000000000
--- a/google/cloud/billing/mocks/mock_cloud_billing_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_billing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_MOCKS_MOCK_CLOUD_BILLING_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_MOCKS_MOCK_CLOUD_BILLING_CONNECTION_H
-
-#include "google/cloud/billing/cloud_billing_connection.h"
-#include "google/cloud/billing/v1/mocks/mock_cloud_billing_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in billing_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace billing_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_v1_mocks::MockCloudBillingConnection directly.
-using ::google::cloud::billing_v1_mocks::MockCloudBillingConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_MOCKS_MOCK_CLOUD_BILLING_CONNECTION_H
diff --git a/google/cloud/billing/mocks/mock_cloud_catalog_connection.h b/google/cloud/billing/mocks/mock_cloud_catalog_connection.h
deleted file mode 100644
index 92fdf1a580a28..0000000000000
--- a/google/cloud/billing/mocks/mock_cloud_catalog_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/billing/v1/cloud_catalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_MOCKS_MOCK_CLOUD_CATALOG_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_MOCKS_MOCK_CLOUD_CATALOG_CONNECTION_H
-
-#include "google/cloud/billing/cloud_catalog_connection.h"
-#include "google/cloud/billing/v1/mocks/mock_cloud_catalog_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in billing_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace billing_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use billing_v1_mocks::MockCloudCatalogConnection directly.
-using ::google::cloud::billing_v1_mocks::MockCloudCatalogConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace billing_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BILLING_MOCKS_MOCK_CLOUD_CATALOG_CONNECTION_H
diff --git a/google/cloud/binaryauthorization/BUILD.bazel b/google/cloud/binaryauthorization/BUILD.bazel
index 98ced73d88efe..80cd3957897db 100644
--- a/google/cloud/binaryauthorization/BUILD.bazel
+++ b/google/cloud/binaryauthorization/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/binaryauthorization/CMakeLists.txt b/google/cloud/binaryauthorization/CMakeLists.txt
index aeef19d1d6dbd..85806a39a59d8 100644
--- a/google/cloud/binaryauthorization/CMakeLists.txt
+++ b/google/cloud/binaryauthorization/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     binaryauthorization "Binary Authorization API"
-    SERVICE_DIRS "__EMPTY__" "v1/"
+    SERVICE_DIRS "v1/"
     SHARED_PROTO_DEPS "grafeas")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
diff --git a/google/cloud/binaryauthorization/binauthz_management_service_v1_client.h b/google/cloud/binaryauthorization/binauthz_management_service_v1_client.h
deleted file mode 100644
index 9d047e61be7e4..0000000000000
--- a/google/cloud/binaryauthorization/binauthz_management_service_v1_client.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_CLIENT_H
-
-#include "google/cloud/binaryauthorization/binauthz_management_service_v1_connection.h"
-#include "google/cloud/binaryauthorization/v1/binauthz_management_service_v1_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in binaryauthorization_v1 instead of the aliases defined
-///     in this namespace.
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use binaryauthorization_v1::BinauthzManagementServiceV1Client
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1Client;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_CLIENT_H
diff --git a/google/cloud/binaryauthorization/binauthz_management_service_v1_connection.h b/google/cloud/binaryauthorization/binauthz_management_service_v1_connection.h
deleted file mode 100644
index 96d6d8c7adb65..0000000000000
--- a/google/cloud/binaryauthorization/binauthz_management_service_v1_connection.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_H
-
-#include "google/cloud/binaryauthorization/binauthz_management_service_v1_connection_idempotency_policy.h"
-#include "google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection.h"
-
-namespace google {
-namespace cloud {
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// binaryauthorization_v1::MakeBinauthzManagementServiceV1Connection directly.
-using ::google::cloud::binaryauthorization_v1::
-    MakeBinauthzManagementServiceV1Connection;
-
-/// @deprecated Use
-/// binaryauthorization_v1::BinauthzManagementServiceV1Connection directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1Connection;
-
-/// @deprecated Use
-/// binaryauthorization_v1::BinauthzManagementServiceV1LimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1LimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// binaryauthorization_v1::BinauthzManagementServiceV1LimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1LimitedTimeRetryPolicy;
-
-/// @deprecated Use
-/// binaryauthorization_v1::BinauthzManagementServiceV1RetryPolicy directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1RetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_H
diff --git a/google/cloud/binaryauthorization/binauthz_management_service_v1_connection_idempotency_policy.h b/google/cloud/binaryauthorization/binauthz_management_service_v1_connection_idempotency_policy.h
deleted file mode 100644
index 96e1f03f331eb..0000000000000
--- a/google/cloud/binaryauthorization/binauthz_management_service_v1_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/binaryauthorization/v1/binauthz_management_service_v1_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// binaryauthorization_v1::MakeDefaultBinauthzManagementServiceV1ConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    MakeDefaultBinauthzManagementServiceV1ConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// binaryauthorization_v1::BinauthzManagementServiceV1ConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1ConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/binaryauthorization/binauthz_management_service_v1_options.h b/google/cloud/binaryauthorization/binauthz_management_service_v1_options.h
deleted file mode 100644
index bcba0e19d2889..0000000000000
--- a/google/cloud/binaryauthorization/binauthz_management_service_v1_options.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_OPTIONS_H
-
-#include "google/cloud/binaryauthorization/binauthz_management_service_v1_connection.h"
-#include "google/cloud/binaryauthorization/binauthz_management_service_v1_connection_idempotency_policy.h"
-#include "google/cloud/binaryauthorization/v1/binauthz_management_service_v1_options.h"
-
-namespace google {
-namespace cloud {
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// binaryauthorization_v1::BinauthzManagementServiceV1BackoffPolicyOption
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1BackoffPolicyOption;
-
-/// @deprecated Use
-/// binaryauthorization_v1::BinauthzManagementServiceV1ConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1ConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// binaryauthorization_v1::BinauthzManagementServiceV1PolicyOptionList
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1PolicyOptionList;
-
-/// @deprecated Use
-/// binaryauthorization_v1::BinauthzManagementServiceV1RetryPolicyOption
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    BinauthzManagementServiceV1RetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_BINAUTHZ_MANAGEMENT_SERVICE_V1_OPTIONS_H
diff --git a/google/cloud/binaryauthorization/mocks/mock_binauthz_management_service_v1_connection.h b/google/cloud/binaryauthorization/mocks/mock_binauthz_management_service_v1_connection.h
deleted file mode 100644
index f718cf397bb67..0000000000000
--- a/google/cloud/binaryauthorization/mocks/mock_binauthz_management_service_v1_connection.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_MOCKS_MOCK_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_MOCKS_MOCK_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_H
-
-#include "google/cloud/binaryauthorization/binauthz_management_service_v1_connection.h"
-#include "google/cloud/binaryauthorization/v1/mocks/mock_binauthz_management_service_v1_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in binaryauthorization_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace binaryauthorization_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// binaryauthorization_v1_mocks::MockBinauthzManagementServiceV1Connection
-/// directly.
-using ::google::cloud::binaryauthorization_v1_mocks::
-    MockBinauthzManagementServiceV1Connection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_MOCKS_MOCK_BINAUTHZ_MANAGEMENT_SERVICE_V1_CONNECTION_H
diff --git a/google/cloud/binaryauthorization/mocks/mock_system_policy_v1_connection.h b/google/cloud/binaryauthorization/mocks/mock_system_policy_v1_connection.h
deleted file mode 100644
index 45b8202e6fb0a..0000000000000
--- a/google/cloud/binaryauthorization/mocks/mock_system_policy_v1_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_MOCKS_MOCK_SYSTEM_POLICY_V1_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_MOCKS_MOCK_SYSTEM_POLICY_V1_CONNECTION_H
-
-#include "google/cloud/binaryauthorization/system_policy_v1_connection.h"
-#include "google/cloud/binaryauthorization/v1/mocks/mock_system_policy_v1_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in binaryauthorization_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace binaryauthorization_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use binaryauthorization_v1_mocks::MockSystemPolicyV1Connection
-/// directly.
-using ::google::cloud::binaryauthorization_v1_mocks::
-    MockSystemPolicyV1Connection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_MOCKS_MOCK_SYSTEM_POLICY_V1_CONNECTION_H
diff --git a/google/cloud/binaryauthorization/mocks/mock_validation_helper_v1_connection.h b/google/cloud/binaryauthorization/mocks/mock_validation_helper_v1_connection.h
deleted file mode 100644
index be41ef3b89488..0000000000000
--- a/google/cloud/binaryauthorization/mocks/mock_validation_helper_v1_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_MOCKS_MOCK_VALIDATION_HELPER_V1_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_MOCKS_MOCK_VALIDATION_HELPER_V1_CONNECTION_H
-
-#include "google/cloud/binaryauthorization/v1/mocks/mock_validation_helper_v1_connection.h"
-#include "google/cloud/binaryauthorization/validation_helper_v1_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in binaryauthorization_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace binaryauthorization_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// binaryauthorization_v1_mocks::MockValidationHelperV1Connection directly.
-using ::google::cloud::binaryauthorization_v1_mocks::
-    MockValidationHelperV1Connection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_MOCKS_MOCK_VALIDATION_HELPER_V1_CONNECTION_H
diff --git a/google/cloud/binaryauthorization/system_policy_v1_client.h b/google/cloud/binaryauthorization/system_policy_v1_client.h
deleted file mode 100644
index dae420e846a1f..0000000000000
--- a/google/cloud/binaryauthorization/system_policy_v1_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_CLIENT_H
-
-#include "google/cloud/binaryauthorization/system_policy_v1_connection.h"
-#include "google/cloud/binaryauthorization/v1/system_policy_v1_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in binaryauthorization_v1 instead of the aliases defined
-///     in this namespace.
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use binaryauthorization_v1::SystemPolicyV1Client directly.
-using ::google::cloud::binaryauthorization_v1::SystemPolicyV1Client;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_CLIENT_H
diff --git a/google/cloud/binaryauthorization/system_policy_v1_connection.h b/google/cloud/binaryauthorization/system_policy_v1_connection.h
deleted file mode 100644
index 1ffe825b49b0a..0000000000000
--- a/google/cloud/binaryauthorization/system_policy_v1_connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_CONNECTION_H
-
-#include "google/cloud/binaryauthorization/system_policy_v1_connection_idempotency_policy.h"
-#include "google/cloud/binaryauthorization/v1/system_policy_v1_connection.h"
-
-namespace google {
-namespace cloud {
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use binaryauthorization_v1::MakeSystemPolicyV1Connection
-/// directly.
-using ::google::cloud::binaryauthorization_v1::MakeSystemPolicyV1Connection;
-
-/// @deprecated Use binaryauthorization_v1::SystemPolicyV1Connection directly.
-using ::google::cloud::binaryauthorization_v1::SystemPolicyV1Connection;
-
-/// @deprecated Use
-/// binaryauthorization_v1::SystemPolicyV1LimitedErrorCountRetryPolicy directly.
-using ::google::cloud::binaryauthorization_v1::
-    SystemPolicyV1LimitedErrorCountRetryPolicy;
-
-/// @deprecated Use binaryauthorization_v1::SystemPolicyV1LimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    SystemPolicyV1LimitedTimeRetryPolicy;
-
-/// @deprecated Use binaryauthorization_v1::SystemPolicyV1RetryPolicy directly.
-using ::google::cloud::binaryauthorization_v1::SystemPolicyV1RetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_CONNECTION_H
diff --git a/google/cloud/binaryauthorization/system_policy_v1_connection_idempotency_policy.h b/google/cloud/binaryauthorization/system_policy_v1_connection_idempotency_policy.h
deleted file mode 100644
index 9a7dadbabaf17..0000000000000
--- a/google/cloud/binaryauthorization/system_policy_v1_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/binaryauthorization/v1/system_policy_v1_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// binaryauthorization_v1::MakeDefaultSystemPolicyV1ConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    MakeDefaultSystemPolicyV1ConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// binaryauthorization_v1::SystemPolicyV1ConnectionIdempotencyPolicy directly.
-using ::google::cloud::binaryauthorization_v1::
-    SystemPolicyV1ConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/binaryauthorization/system_policy_v1_options.h b/google/cloud/binaryauthorization/system_policy_v1_options.h
deleted file mode 100644
index 4c019adf2d0ae..0000000000000
--- a/google/cloud/binaryauthorization/system_policy_v1_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_OPTIONS_H
-
-#include "google/cloud/binaryauthorization/system_policy_v1_connection.h"
-#include "google/cloud/binaryauthorization/system_policy_v1_connection_idempotency_policy.h"
-#include "google/cloud/binaryauthorization/v1/system_policy_v1_options.h"
-
-namespace google {
-namespace cloud {
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use binaryauthorization_v1::SystemPolicyV1BackoffPolicyOption
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    SystemPolicyV1BackoffPolicyOption;
-
-/// @deprecated Use
-/// binaryauthorization_v1::SystemPolicyV1ConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    SystemPolicyV1ConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use binaryauthorization_v1::SystemPolicyV1PolicyOptionList
-/// directly.
-using ::google::cloud::binaryauthorization_v1::SystemPolicyV1PolicyOptionList;
-
-/// @deprecated Use binaryauthorization_v1::SystemPolicyV1RetryPolicyOption
-/// directly.
-using ::google::cloud::binaryauthorization_v1::SystemPolicyV1RetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_SYSTEM_POLICY_V1_OPTIONS_H
diff --git a/google/cloud/binaryauthorization/validation_helper_v1_client.h b/google/cloud/binaryauthorization/validation_helper_v1_client.h
deleted file mode 100644
index 6018b7a394276..0000000000000
--- a/google/cloud/binaryauthorization/validation_helper_v1_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_CLIENT_H
-
-#include "google/cloud/binaryauthorization/v1/validation_helper_v1_client.h"
-#include "google/cloud/binaryauthorization/validation_helper_v1_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in binaryauthorization_v1 instead of the aliases defined
-///     in this namespace.
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use binaryauthorization_v1::ValidationHelperV1Client directly.
-using ::google::cloud::binaryauthorization_v1::ValidationHelperV1Client;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_CLIENT_H
diff --git a/google/cloud/binaryauthorization/validation_helper_v1_connection.h b/google/cloud/binaryauthorization/validation_helper_v1_connection.h
deleted file mode 100644
index fa5175d0ab4bf..0000000000000
--- a/google/cloud/binaryauthorization/validation_helper_v1_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_CONNECTION_H
-
-#include "google/cloud/binaryauthorization/v1/validation_helper_v1_connection.h"
-#include "google/cloud/binaryauthorization/validation_helper_v1_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use binaryauthorization_v1::MakeValidationHelperV1Connection
-/// directly.
-using ::google::cloud::binaryauthorization_v1::MakeValidationHelperV1Connection;
-
-/// @deprecated Use binaryauthorization_v1::ValidationHelperV1Connection
-/// directly.
-using ::google::cloud::binaryauthorization_v1::ValidationHelperV1Connection;
-
-/// @deprecated Use
-/// binaryauthorization_v1::ValidationHelperV1LimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    ValidationHelperV1LimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// binaryauthorization_v1::ValidationHelperV1LimitedTimeRetryPolicy directly.
-using ::google::cloud::binaryauthorization_v1::
-    ValidationHelperV1LimitedTimeRetryPolicy;
-
-/// @deprecated Use binaryauthorization_v1::ValidationHelperV1RetryPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::ValidationHelperV1RetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_CONNECTION_H
diff --git a/google/cloud/binaryauthorization/validation_helper_v1_connection_idempotency_policy.h b/google/cloud/binaryauthorization/validation_helper_v1_connection_idempotency_policy.h
deleted file mode 100644
index 8d5e61aec6049..0000000000000
--- a/google/cloud/binaryauthorization/validation_helper_v1_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/binaryauthorization/v1/validation_helper_v1_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// binaryauthorization_v1::MakeDefaultValidationHelperV1ConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    MakeDefaultValidationHelperV1ConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// binaryauthorization_v1::ValidationHelperV1ConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    ValidationHelperV1ConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/binaryauthorization/validation_helper_v1_options.h b/google/cloud/binaryauthorization/validation_helper_v1_options.h
deleted file mode 100644
index 607889c06b354..0000000000000
--- a/google/cloud/binaryauthorization/validation_helper_v1_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/binaryauthorization/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_OPTIONS_H
-
-#include "google/cloud/binaryauthorization/v1/validation_helper_v1_options.h"
-#include "google/cloud/binaryauthorization/validation_helper_v1_connection.h"
-#include "google/cloud/binaryauthorization/validation_helper_v1_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace binaryauthorization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// binaryauthorization_v1::ValidationHelperV1BackoffPolicyOption directly.
-using ::google::cloud::binaryauthorization_v1::
-    ValidationHelperV1BackoffPolicyOption;
-
-/// @deprecated Use
-/// binaryauthorization_v1::ValidationHelperV1ConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    ValidationHelperV1ConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use binaryauthorization_v1::ValidationHelperV1PolicyOptionList
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    ValidationHelperV1PolicyOptionList;
-
-/// @deprecated Use binaryauthorization_v1::ValidationHelperV1RetryPolicyOption
-/// directly.
-using ::google::cloud::binaryauthorization_v1::
-    ValidationHelperV1RetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace binaryauthorization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BINARYAUTHORIZATION_VALIDATION_HELPER_V1_OPTIONS_H
diff --git a/google/cloud/certificatemanager/BUILD.bazel b/google/cloud/certificatemanager/BUILD.bazel
index ec9b433a64ea9..5b484034f4a4c 100644
--- a/google/cloud/certificatemanager/BUILD.bazel
+++ b/google/cloud/certificatemanager/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/certificatemanager/CMakeLists.txt b/google/cloud/certificatemanager/CMakeLists.txt
index c199c83f52646..5f77e0c1729a1 100644
--- a/google/cloud/certificatemanager/CMakeLists.txt
+++ b/google/cloud/certificatemanager/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(certificatemanager "Certificate Manager API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(certificatemanager_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/certificatemanager/certificate_manager_client.h b/google/cloud/certificatemanager/certificate_manager_client.h
deleted file mode 100644
index 382e403a78c7b..0000000000000
--- a/google/cloud/certificatemanager/certificate_manager_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/certificatemanager/v1/certificate_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_CLIENT_H
-
-#include "google/cloud/certificatemanager/certificate_manager_connection.h"
-#include "google/cloud/certificatemanager/v1/certificate_manager_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in certificatemanager_v1 instead of the aliases defined in
-///     this namespace.
-namespace certificatemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use certificatemanager_v1::CertificateManagerClient directly.
-using ::google::cloud::certificatemanager_v1::CertificateManagerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace certificatemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_CLIENT_H
diff --git a/google/cloud/certificatemanager/certificate_manager_connection.h b/google/cloud/certificatemanager/certificate_manager_connection.h
deleted file mode 100644
index 321a173ba2f6c..0000000000000
--- a/google/cloud/certificatemanager/certificate_manager_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/certificatemanager/v1/certificate_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_CONNECTION_H
-
-#include "google/cloud/certificatemanager/certificate_manager_connection_idempotency_policy.h"
-#include "google/cloud/certificatemanager/v1/certificate_manager_connection.h"
-
-namespace google {
-namespace cloud {
-namespace certificatemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use certificatemanager_v1::MakeCertificateManagerConnection
-/// directly.
-using ::google::cloud::certificatemanager_v1::MakeCertificateManagerConnection;
-
-/// @deprecated Use certificatemanager_v1::CertificateManagerConnection
-/// directly.
-using ::google::cloud::certificatemanager_v1::CertificateManagerConnection;
-
-/// @deprecated Use
-/// certificatemanager_v1::CertificateManagerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::certificatemanager_v1::
-    CertificateManagerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// certificatemanager_v1::CertificateManagerLimitedTimeRetryPolicy directly.
-using ::google::cloud::certificatemanager_v1::
-    CertificateManagerLimitedTimeRetryPolicy;
-
-/// @deprecated Use certificatemanager_v1::CertificateManagerRetryPolicy
-/// directly.
-using ::google::cloud::certificatemanager_v1::CertificateManagerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace certificatemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_CONNECTION_H
diff --git a/google/cloud/certificatemanager/certificate_manager_connection_idempotency_policy.h b/google/cloud/certificatemanager/certificate_manager_connection_idempotency_policy.h
deleted file mode 100644
index a1c7eb7703244..0000000000000
--- a/google/cloud/certificatemanager/certificate_manager_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/certificatemanager/v1/certificate_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/certificatemanager/v1/certificate_manager_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace certificatemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// certificatemanager_v1::MakeDefaultCertificateManagerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::certificatemanager_v1::
-    MakeDefaultCertificateManagerConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// certificatemanager_v1::CertificateManagerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::certificatemanager_v1::
-    CertificateManagerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace certificatemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/certificatemanager/certificate_manager_options.h b/google/cloud/certificatemanager/certificate_manager_options.h
deleted file mode 100644
index e0f21b1771f10..0000000000000
--- a/google/cloud/certificatemanager/certificate_manager_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/certificatemanager/v1/certificate_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_OPTIONS_H
-
-#include "google/cloud/certificatemanager/certificate_manager_connection.h"
-#include "google/cloud/certificatemanager/certificate_manager_connection_idempotency_policy.h"
-#include "google/cloud/certificatemanager/v1/certificate_manager_options.h"
-
-namespace google {
-namespace cloud {
-namespace certificatemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use certificatemanager_v1::CertificateManagerPollingPolicyOption
-/// directly.
-using ::google::cloud::certificatemanager_v1::
-    CertificateManagerPollingPolicyOption;
-
-/// @deprecated Use certificatemanager_v1::CertificateManagerBackoffPolicyOption
-/// directly.
-using ::google::cloud::certificatemanager_v1::
-    CertificateManagerBackoffPolicyOption;
-
-/// @deprecated Use
-/// certificatemanager_v1::CertificateManagerConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::certificatemanager_v1::
-    CertificateManagerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use certificatemanager_v1::CertificateManagerPolicyOptionList
-/// directly.
-using ::google::cloud::certificatemanager_v1::
-    CertificateManagerPolicyOptionList;
-
-/// @deprecated Use certificatemanager_v1::CertificateManagerRetryPolicyOption
-/// directly.
-using ::google::cloud::certificatemanager_v1::
-    CertificateManagerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace certificatemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_CERTIFICATE_MANAGER_OPTIONS_H
diff --git a/google/cloud/certificatemanager/mocks/mock_certificate_manager_connection.h b/google/cloud/certificatemanager/mocks/mock_certificate_manager_connection.h
deleted file mode 100644
index 89575a80fcbfc..0000000000000
--- a/google/cloud/certificatemanager/mocks/mock_certificate_manager_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/certificatemanager/v1/certificate_manager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_MOCKS_MOCK_CERTIFICATE_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_MOCKS_MOCK_CERTIFICATE_MANAGER_CONNECTION_H
-
-#include "google/cloud/certificatemanager/certificate_manager_connection.h"
-#include "google/cloud/certificatemanager/v1/mocks/mock_certificate_manager_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in certificatemanager_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace certificatemanager_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// certificatemanager_v1_mocks::MockCertificateManagerConnection directly.
-using ::google::cloud::certificatemanager_v1_mocks::
-    MockCertificateManagerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace certificatemanager_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CERTIFICATEMANAGER_MOCKS_MOCK_CERTIFICATE_MANAGER_CONNECTION_H
diff --git a/google/cloud/channel/BUILD.bazel b/google/cloud/channel/BUILD.bazel
index 62e52387ed905..4e12837ea2115 100644
--- a/google/cloud/channel/BUILD.bazel
+++ b/google/cloud/channel/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/channel/CMakeLists.txt b/google/cloud/channel/CMakeLists.txt
index 1dcd79c464eb7..1343b8229074c 100644
--- a/google/cloud/channel/CMakeLists.txt
+++ b/google/cloud/channel/CMakeLists.txt
@@ -30,7 +30,7 @@ endif ()
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(channel "Cloud Channel API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 # The quickstart is too difficult to run successfully, hence, there is no
 # quickstart runner.
diff --git a/google/cloud/channel/cloud_channel_client.h b/google/cloud/channel/cloud_channel_client.h
deleted file mode 100644
index ba6d39ebf40ff..0000000000000
--- a/google/cloud/channel/cloud_channel_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/channel/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_CLIENT_H
-
-#include "google/cloud/channel/cloud_channel_connection.h"
-#include "google/cloud/channel/v1/cloud_channel_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in channel_v1 instead of the aliases defined in
-///     this namespace.
-namespace channel {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use channel_v1::CloudChannelServiceClient directly.
-using ::google::cloud::channel_v1::CloudChannelServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace channel
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_CLIENT_H
diff --git a/google/cloud/channel/cloud_channel_connection.h b/google/cloud/channel/cloud_channel_connection.h
deleted file mode 100644
index bf43fb3fb182c..0000000000000
--- a/google/cloud/channel/cloud_channel_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/channel/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_CONNECTION_H
-
-#include "google/cloud/channel/cloud_channel_connection_idempotency_policy.h"
-#include "google/cloud/channel/v1/cloud_channel_connection.h"
-
-namespace google {
-namespace cloud {
-namespace channel {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use channel_v1::MakeCloudChannelServiceConnection directly.
-using ::google::cloud::channel_v1::MakeCloudChannelServiceConnection;
-
-/// @deprecated Use channel_v1::CloudChannelServiceConnection directly.
-using ::google::cloud::channel_v1::CloudChannelServiceConnection;
-
-/// @deprecated Use channel_v1::CloudChannelServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::channel_v1::
-    CloudChannelServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use channel_v1::CloudChannelServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::channel_v1::CloudChannelServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use channel_v1::CloudChannelServiceRetryPolicy directly.
-using ::google::cloud::channel_v1::CloudChannelServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace channel
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_CONNECTION_H
diff --git a/google/cloud/channel/cloud_channel_connection_idempotency_policy.h b/google/cloud/channel/cloud_channel_connection_idempotency_policy.h
deleted file mode 100644
index 1913b4f96f1a9..0000000000000
--- a/google/cloud/channel/cloud_channel_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/channel/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/channel/v1/cloud_channel_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace channel {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// channel_v1::MakeDefaultCloudChannelServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::channel_v1::
-    MakeDefaultCloudChannelServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use channel_v1::CloudChannelServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::channel_v1::
-    CloudChannelServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace channel
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/channel/cloud_channel_options.h b/google/cloud/channel/cloud_channel_options.h
deleted file mode 100644
index 3c07d1a339ce0..0000000000000
--- a/google/cloud/channel/cloud_channel_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/channel/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_OPTIONS_H
-
-#include "google/cloud/channel/cloud_channel_connection.h"
-#include "google/cloud/channel/cloud_channel_connection_idempotency_policy.h"
-#include "google/cloud/channel/v1/cloud_channel_options.h"
-
-namespace google {
-namespace cloud {
-namespace channel {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use channel_v1::CloudChannelServicePollingPolicyOption directly.
-using ::google::cloud::channel_v1::CloudChannelServicePollingPolicyOption;
-
-/// @deprecated Use channel_v1::CloudChannelServiceBackoffPolicyOption directly.
-using ::google::cloud::channel_v1::CloudChannelServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// channel_v1::CloudChannelServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::channel_v1::
-    CloudChannelServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use channel_v1::CloudChannelServicePolicyOptionList directly.
-using ::google::cloud::channel_v1::CloudChannelServicePolicyOptionList;
-
-/// @deprecated Use channel_v1::CloudChannelServiceRetryPolicyOption directly.
-using ::google::cloud::channel_v1::CloudChannelServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace channel
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_CLOUD_CHANNEL_OPTIONS_H
diff --git a/google/cloud/channel/mocks/mock_cloud_channel_connection.h b/google/cloud/channel/mocks/mock_cloud_channel_connection.h
deleted file mode 100644
index 4540650bf0b4c..0000000000000
--- a/google/cloud/channel/mocks/mock_cloud_channel_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/channel/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_MOCKS_MOCK_CLOUD_CHANNEL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_MOCKS_MOCK_CLOUD_CHANNEL_CONNECTION_H
-
-#include "google/cloud/channel/cloud_channel_connection.h"
-#include "google/cloud/channel/v1/mocks/mock_cloud_channel_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in channel_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace channel_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use channel_v1_mocks::MockCloudChannelServiceConnection
-/// directly.
-using ::google::cloud::channel_v1_mocks::MockCloudChannelServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace channel_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_MOCKS_MOCK_CLOUD_CHANNEL_CONNECTION_H
diff --git a/google/cloud/cloudbuild/BUILD.bazel b/google/cloud/cloudbuild/BUILD.bazel
index 7eccc2b26c739..feb32e7596cc3 100644
--- a/google/cloud/cloudbuild/BUILD.bazel
+++ b/google/cloud/cloudbuild/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "v2/",
 ]
diff --git a/google/cloud/cloudbuild/CMakeLists.txt b/google/cloud/cloudbuild/CMakeLists.txt
index 092f04447428e..41283f601ce7a 100644
--- a/google/cloud/cloudbuild/CMakeLists.txt
+++ b/google/cloud/cloudbuild/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(cloudbuild "Cloud Build API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/" "v2/")
+                                   SERVICE_DIRS "v1/" "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(cloudbuild_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/cloudbuild/cloud_build_client.h b/google/cloud/cloudbuild/cloud_build_client.h
deleted file mode 100644
index 78d7e12c027e0..0000000000000
--- a/google/cloud/cloudbuild/cloud_build_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudbuild/v1/cloudbuild.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_CLIENT_H
-
-#include "google/cloud/cloudbuild/cloud_build_connection.h"
-#include "google/cloud/cloudbuild/v1/cloud_build_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in cloudbuild_v1 instead of the aliases defined in
-///     this namespace.
-namespace cloudbuild {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use cloudbuild_v1::CloudBuildClient directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace cloudbuild
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_CLIENT_H
diff --git a/google/cloud/cloudbuild/cloud_build_connection.h b/google/cloud/cloudbuild/cloud_build_connection.h
deleted file mode 100644
index cd8380d8a59a1..0000000000000
--- a/google/cloud/cloudbuild/cloud_build_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudbuild/v1/cloudbuild.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_CONNECTION_H
-
-#include "google/cloud/cloudbuild/cloud_build_connection_idempotency_policy.h"
-#include "google/cloud/cloudbuild/v1/cloud_build_connection.h"
-
-namespace google {
-namespace cloud {
-namespace cloudbuild {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use cloudbuild_v1::MakeCloudBuildConnection directly.
-using ::google::cloud::cloudbuild_v1::MakeCloudBuildConnection;
-
-/// @deprecated Use cloudbuild_v1::CloudBuildConnection directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildConnection;
-
-/// @deprecated Use cloudbuild_v1::CloudBuildLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use cloudbuild_v1::CloudBuildLimitedTimeRetryPolicy directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildLimitedTimeRetryPolicy;
-
-/// @deprecated Use cloudbuild_v1::CloudBuildRetryPolicy directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace cloudbuild
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_CONNECTION_H
diff --git a/google/cloud/cloudbuild/cloud_build_connection_idempotency_policy.h b/google/cloud/cloudbuild/cloud_build_connection_idempotency_policy.h
deleted file mode 100644
index 0e1647882fc7b..0000000000000
--- a/google/cloud/cloudbuild/cloud_build_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudbuild/v1/cloudbuild.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/cloudbuild/v1/cloud_build_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace cloudbuild {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// cloudbuild_v1::MakeDefaultCloudBuildConnectionIdempotencyPolicy directly.
-using ::google::cloud::cloudbuild_v1::
-    MakeDefaultCloudBuildConnectionIdempotencyPolicy;
-
-/// @deprecated Use cloudbuild_v1::CloudBuildConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace cloudbuild
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/cloudbuild/cloud_build_options.h b/google/cloud/cloudbuild/cloud_build_options.h
deleted file mode 100644
index 3c28f4ea7a1d9..0000000000000
--- a/google/cloud/cloudbuild/cloud_build_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudbuild/v1/cloudbuild.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_OPTIONS_H
-
-#include "google/cloud/cloudbuild/cloud_build_connection.h"
-#include "google/cloud/cloudbuild/cloud_build_connection_idempotency_policy.h"
-#include "google/cloud/cloudbuild/v1/cloud_build_options.h"
-
-namespace google {
-namespace cloud {
-namespace cloudbuild {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use cloudbuild_v1::CloudBuildPollingPolicyOption directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildPollingPolicyOption;
-
-/// @deprecated Use cloudbuild_v1::CloudBuildBackoffPolicyOption directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildBackoffPolicyOption;
-
-/// @deprecated Use cloudbuild_v1::CloudBuildConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::cloudbuild_v1::
-    CloudBuildConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use cloudbuild_v1::CloudBuildPolicyOptionList directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildPolicyOptionList;
-
-/// @deprecated Use cloudbuild_v1::CloudBuildRetryPolicyOption directly.
-using ::google::cloud::cloudbuild_v1::CloudBuildRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace cloudbuild
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_CLOUD_BUILD_OPTIONS_H
diff --git a/google/cloud/cloudbuild/mocks/mock_cloud_build_connection.h b/google/cloud/cloudbuild/mocks/mock_cloud_build_connection.h
deleted file mode 100644
index e0d2063cf4807..0000000000000
--- a/google/cloud/cloudbuild/mocks/mock_cloud_build_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudbuild/v1/cloudbuild.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_MOCKS_MOCK_CLOUD_BUILD_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_MOCKS_MOCK_CLOUD_BUILD_CONNECTION_H
-
-#include "google/cloud/cloudbuild/cloud_build_connection.h"
-#include "google/cloud/cloudbuild/v1/mocks/mock_cloud_build_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in cloudbuild_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace cloudbuild_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use cloudbuild_v1_mocks::MockCloudBuildConnection directly.
-using ::google::cloud::cloudbuild_v1_mocks::MockCloudBuildConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace cloudbuild_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDBUILD_MOCKS_MOCK_CLOUD_BUILD_CONNECTION_H
diff --git a/google/cloud/cloudquotas/CMakeLists.txt b/google/cloud/cloudquotas/CMakeLists.txt
index d80fe662aff6d..95de9c1540d16 100644
--- a/google/cloud/cloudquotas/CMakeLists.txt
+++ b/google/cloud/cloudquotas/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(cloudquotas "Cloud Quotas API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(cloudquotas_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/composer/BUILD.bazel b/google/cloud/composer/BUILD.bazel
index 780416b0ec51a..c55718ad0934c 100644
--- a/google/cloud/composer/BUILD.bazel
+++ b/google/cloud/composer/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/composer/CMakeLists.txt b/google/cloud/composer/CMakeLists.txt
index 05a373cc88c5d..7c82919446123 100644
--- a/google/cloud/composer/CMakeLists.txt
+++ b/google/cloud/composer/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(composer "Cloud Composer API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(composer_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/composer/environments_client.h b/google/cloud/composer/environments_client.h
deleted file mode 100644
index f8b5505e24e85..0000000000000
--- a/google/cloud/composer/environments_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/environments.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_CLIENT_H
-
-#include "google/cloud/composer/environments_connection.h"
-#include "google/cloud/composer/v1/environments_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in composer_v1 instead of the aliases defined in
-///     this namespace.
-namespace composer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use composer_v1::EnvironmentsClient directly.
-using ::google::cloud::composer_v1::EnvironmentsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_CLIENT_H
diff --git a/google/cloud/composer/environments_connection.h b/google/cloud/composer/environments_connection.h
deleted file mode 100644
index c9183ed955800..0000000000000
--- a/google/cloud/composer/environments_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/environments.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_CONNECTION_H
-
-#include "google/cloud/composer/environments_connection_idempotency_policy.h"
-#include "google/cloud/composer/v1/environments_connection.h"
-
-namespace google {
-namespace cloud {
-namespace composer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use composer_v1::MakeEnvironmentsConnection directly.
-using ::google::cloud::composer_v1::MakeEnvironmentsConnection;
-
-/// @deprecated Use composer_v1::EnvironmentsConnection directly.
-using ::google::cloud::composer_v1::EnvironmentsConnection;
-
-/// @deprecated Use composer_v1::EnvironmentsLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::composer_v1::EnvironmentsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use composer_v1::EnvironmentsLimitedTimeRetryPolicy directly.
-using ::google::cloud::composer_v1::EnvironmentsLimitedTimeRetryPolicy;
-
-/// @deprecated Use composer_v1::EnvironmentsRetryPolicy directly.
-using ::google::cloud::composer_v1::EnvironmentsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_CONNECTION_H
diff --git a/google/cloud/composer/environments_connection_idempotency_policy.h b/google/cloud/composer/environments_connection_idempotency_policy.h
deleted file mode 100644
index fa242f6dfc11a..0000000000000
--- a/google/cloud/composer/environments_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/environments.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/composer/v1/environments_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace composer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// composer_v1::MakeDefaultEnvironmentsConnectionIdempotencyPolicy directly.
-using ::google::cloud::composer_v1::
-    MakeDefaultEnvironmentsConnectionIdempotencyPolicy;
-
-/// @deprecated Use composer_v1::EnvironmentsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::composer_v1::EnvironmentsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/composer/environments_options.h b/google/cloud/composer/environments_options.h
deleted file mode 100644
index 2e3b9ac49a6f8..0000000000000
--- a/google/cloud/composer/environments_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/environments.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_OPTIONS_H
-
-#include "google/cloud/composer/environments_connection.h"
-#include "google/cloud/composer/environments_connection_idempotency_policy.h"
-#include "google/cloud/composer/v1/environments_options.h"
-
-namespace google {
-namespace cloud {
-namespace composer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use composer_v1::EnvironmentsPollingPolicyOption directly.
-using ::google::cloud::composer_v1::EnvironmentsPollingPolicyOption;
-
-/// @deprecated Use composer_v1::EnvironmentsBackoffPolicyOption directly.
-using ::google::cloud::composer_v1::EnvironmentsBackoffPolicyOption;
-
-/// @deprecated Use composer_v1::EnvironmentsConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::composer_v1::
-    EnvironmentsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use composer_v1::EnvironmentsPolicyOptionList directly.
-using ::google::cloud::composer_v1::EnvironmentsPolicyOptionList;
-
-/// @deprecated Use composer_v1::EnvironmentsRetryPolicyOption directly.
-using ::google::cloud::composer_v1::EnvironmentsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_ENVIRONMENTS_OPTIONS_H
diff --git a/google/cloud/composer/image_versions_client.h b/google/cloud/composer/image_versions_client.h
deleted file mode 100644
index f3d03214ea0ab..0000000000000
--- a/google/cloud/composer/image_versions_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/image_versions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_CLIENT_H
-
-#include "google/cloud/composer/image_versions_connection.h"
-#include "google/cloud/composer/v1/image_versions_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in composer_v1 instead of the aliases defined in
-///     this namespace.
-namespace composer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use composer_v1::ImageVersionsClient directly.
-using ::google::cloud::composer_v1::ImageVersionsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_CLIENT_H
diff --git a/google/cloud/composer/image_versions_connection.h b/google/cloud/composer/image_versions_connection.h
deleted file mode 100644
index 843ad599a1473..0000000000000
--- a/google/cloud/composer/image_versions_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/image_versions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_CONNECTION_H
-
-#include "google/cloud/composer/image_versions_connection_idempotency_policy.h"
-#include "google/cloud/composer/v1/image_versions_connection.h"
-
-namespace google {
-namespace cloud {
-namespace composer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use composer_v1::MakeImageVersionsConnection directly.
-using ::google::cloud::composer_v1::MakeImageVersionsConnection;
-
-/// @deprecated Use composer_v1::ImageVersionsConnection directly.
-using ::google::cloud::composer_v1::ImageVersionsConnection;
-
-/// @deprecated Use composer_v1::ImageVersionsLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::composer_v1::ImageVersionsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use composer_v1::ImageVersionsLimitedTimeRetryPolicy directly.
-using ::google::cloud::composer_v1::ImageVersionsLimitedTimeRetryPolicy;
-
-/// @deprecated Use composer_v1::ImageVersionsRetryPolicy directly.
-using ::google::cloud::composer_v1::ImageVersionsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_CONNECTION_H
diff --git a/google/cloud/composer/image_versions_connection_idempotency_policy.h b/google/cloud/composer/image_versions_connection_idempotency_policy.h
deleted file mode 100644
index 759574c080acb..0000000000000
--- a/google/cloud/composer/image_versions_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/image_versions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/composer/v1/image_versions_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace composer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// composer_v1::MakeDefaultImageVersionsConnectionIdempotencyPolicy directly.
-using ::google::cloud::composer_v1::
-    MakeDefaultImageVersionsConnectionIdempotencyPolicy;
-
-/// @deprecated Use composer_v1::ImageVersionsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::composer_v1::ImageVersionsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/composer/image_versions_options.h b/google/cloud/composer/image_versions_options.h
deleted file mode 100644
index 5453676d3a01b..0000000000000
--- a/google/cloud/composer/image_versions_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/image_versions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_OPTIONS_H
-
-#include "google/cloud/composer/image_versions_connection.h"
-#include "google/cloud/composer/image_versions_connection_idempotency_policy.h"
-#include "google/cloud/composer/v1/image_versions_options.h"
-
-namespace google {
-namespace cloud {
-namespace composer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use composer_v1::ImageVersionsBackoffPolicyOption directly.
-using ::google::cloud::composer_v1::ImageVersionsBackoffPolicyOption;
-
-/// @deprecated Use composer_v1::ImageVersionsConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::composer_v1::
-    ImageVersionsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use composer_v1::ImageVersionsPolicyOptionList directly.
-using ::google::cloud::composer_v1::ImageVersionsPolicyOptionList;
-
-/// @deprecated Use composer_v1::ImageVersionsRetryPolicyOption directly.
-using ::google::cloud::composer_v1::ImageVersionsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_IMAGE_VERSIONS_OPTIONS_H
diff --git a/google/cloud/composer/mocks/mock_environments_connection.h b/google/cloud/composer/mocks/mock_environments_connection.h
deleted file mode 100644
index 17e1dba9d6cfe..0000000000000
--- a/google/cloud/composer/mocks/mock_environments_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/environments.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_MOCKS_MOCK_ENVIRONMENTS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_MOCKS_MOCK_ENVIRONMENTS_CONNECTION_H
-
-#include "google/cloud/composer/environments_connection.h"
-#include "google/cloud/composer/v1/mocks/mock_environments_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in composer_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace composer_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use composer_v1_mocks::MockEnvironmentsConnection directly.
-using ::google::cloud::composer_v1_mocks::MockEnvironmentsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_MOCKS_MOCK_ENVIRONMENTS_CONNECTION_H
diff --git a/google/cloud/composer/mocks/mock_image_versions_connection.h b/google/cloud/composer/mocks/mock_image_versions_connection.h
deleted file mode 100644
index c50f742e9d40b..0000000000000
--- a/google/cloud/composer/mocks/mock_image_versions_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orchestration/airflow/service/v1/image_versions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_MOCKS_MOCK_IMAGE_VERSIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_MOCKS_MOCK_IMAGE_VERSIONS_CONNECTION_H
-
-#include "google/cloud/composer/image_versions_connection.h"
-#include "google/cloud/composer/v1/mocks/mock_image_versions_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in composer_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace composer_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use composer_v1_mocks::MockImageVersionsConnection directly.
-using ::google::cloud::composer_v1_mocks::MockImageVersionsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace composer_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_COMPOSER_MOCKS_MOCK_IMAGE_VERSIONS_CONNECTION_H
diff --git a/google/cloud/connectors/BUILD.bazel b/google/cloud/connectors/BUILD.bazel
index 0388017908f91..6ec21767c37f1 100644
--- a/google/cloud/connectors/BUILD.bazel
+++ b/google/cloud/connectors/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/connectors/CMakeLists.txt b/google/cloud/connectors/CMakeLists.txt
index 09fa025f1cd28..13c429a85fe32 100644
--- a/google/cloud/connectors/CMakeLists.txt
+++ b/google/cloud/connectors/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(connectors "Connectors API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(connectors_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/connectors/connectors_client.h b/google/cloud/connectors/connectors_client.h
deleted file mode 100644
index 6e4a548409db4..0000000000000
--- a/google/cloud/connectors/connectors_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/connectors/v1/connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_CLIENT_H
-
-#include "google/cloud/connectors/connectors_connection.h"
-#include "google/cloud/connectors/v1/connectors_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in connectors_v1 instead of the aliases defined in
-///     this namespace.
-namespace connectors {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use connectors_v1::ConnectorsClient directly.
-using ::google::cloud::connectors_v1::ConnectorsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace connectors
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_CLIENT_H
diff --git a/google/cloud/connectors/connectors_connection.h b/google/cloud/connectors/connectors_connection.h
deleted file mode 100644
index fcb186fa66327..0000000000000
--- a/google/cloud/connectors/connectors_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/connectors/v1/connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_CONNECTION_H
-
-#include "google/cloud/connectors/connectors_connection_idempotency_policy.h"
-#include "google/cloud/connectors/v1/connectors_connection.h"
-
-namespace google {
-namespace cloud {
-namespace connectors {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use connectors_v1::MakeConnectorsConnection directly.
-using ::google::cloud::connectors_v1::MakeConnectorsConnection;
-
-/// @deprecated Use connectors_v1::ConnectorsConnection directly.
-using ::google::cloud::connectors_v1::ConnectorsConnection;
-
-/// @deprecated Use connectors_v1::ConnectorsLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::connectors_v1::ConnectorsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use connectors_v1::ConnectorsLimitedTimeRetryPolicy directly.
-using ::google::cloud::connectors_v1::ConnectorsLimitedTimeRetryPolicy;
-
-/// @deprecated Use connectors_v1::ConnectorsRetryPolicy directly.
-using ::google::cloud::connectors_v1::ConnectorsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace connectors
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_CONNECTION_H
diff --git a/google/cloud/connectors/connectors_connection_idempotency_policy.h b/google/cloud/connectors/connectors_connection_idempotency_policy.h
deleted file mode 100644
index 43b62714ce751..0000000000000
--- a/google/cloud/connectors/connectors_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/connectors/v1/connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/connectors/v1/connectors_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace connectors {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// connectors_v1::MakeDefaultConnectorsConnectionIdempotencyPolicy directly.
-using ::google::cloud::connectors_v1::
-    MakeDefaultConnectorsConnectionIdempotencyPolicy;
-
-/// @deprecated Use connectors_v1::ConnectorsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::connectors_v1::ConnectorsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace connectors
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/connectors/connectors_options.h b/google/cloud/connectors/connectors_options.h
deleted file mode 100644
index f1e33e05c84a6..0000000000000
--- a/google/cloud/connectors/connectors_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/connectors/v1/connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_OPTIONS_H
-
-#include "google/cloud/connectors/connectors_connection.h"
-#include "google/cloud/connectors/connectors_connection_idempotency_policy.h"
-#include "google/cloud/connectors/v1/connectors_options.h"
-
-namespace google {
-namespace cloud {
-namespace connectors {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use connectors_v1::ConnectorsPollingPolicyOption directly.
-using ::google::cloud::connectors_v1::ConnectorsPollingPolicyOption;
-
-/// @deprecated Use connectors_v1::ConnectorsBackoffPolicyOption directly.
-using ::google::cloud::connectors_v1::ConnectorsBackoffPolicyOption;
-
-/// @deprecated Use connectors_v1::ConnectorsConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::connectors_v1::
-    ConnectorsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use connectors_v1::ConnectorsPolicyOptionList directly.
-using ::google::cloud::connectors_v1::ConnectorsPolicyOptionList;
-
-/// @deprecated Use connectors_v1::ConnectorsRetryPolicyOption directly.
-using ::google::cloud::connectors_v1::ConnectorsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace connectors
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_CONNECTORS_OPTIONS_H
diff --git a/google/cloud/connectors/mocks/mock_connectors_connection.h b/google/cloud/connectors/mocks/mock_connectors_connection.h
deleted file mode 100644
index e366152ec9e49..0000000000000
--- a/google/cloud/connectors/mocks/mock_connectors_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/connectors/v1/connectors_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_MOCKS_MOCK_CONNECTORS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_MOCKS_MOCK_CONNECTORS_CONNECTION_H
-
-#include "google/cloud/connectors/connectors_connection.h"
-#include "google/cloud/connectors/v1/mocks/mock_connectors_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in connectors_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace connectors_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use connectors_v1_mocks::MockConnectorsConnection directly.
-using ::google::cloud::connectors_v1_mocks::MockConnectorsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace connectors_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONNECTORS_MOCKS_MOCK_CONNECTORS_CONNECTION_H
diff --git a/google/cloud/contactcenterinsights/BUILD.bazel b/google/cloud/contactcenterinsights/BUILD.bazel
index 0537f29ec8d91..224c97c52f581 100644
--- a/google/cloud/contactcenterinsights/BUILD.bazel
+++ b/google/cloud/contactcenterinsights/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/contactcenterinsights/CMakeLists.txt b/google/cloud/contactcenterinsights/CMakeLists.txt
index 33f15b8894b31..8671a704d20ec 100644
--- a/google/cloud/contactcenterinsights/CMakeLists.txt
+++ b/google/cloud/contactcenterinsights/CMakeLists.txt
@@ -17,8 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
-    contactcenterinsights "Contact Center AI Insights API"
-    SERVICE_DIRS "__EMPTY__" "v1/")
+    contactcenterinsights "Contact Center AI Insights API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(contactcenterinsights_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/contactcenterinsights/contact_center_insights_client.h b/google/cloud/contactcenterinsights/contact_center_insights_client.h
deleted file mode 100644
index 8f61a3f07c1b4..0000000000000
--- a/google/cloud/contactcenterinsights/contact_center_insights_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_CLIENT_H
-
-#include "google/cloud/contactcenterinsights/contact_center_insights_connection.h"
-#include "google/cloud/contactcenterinsights/v1/contact_center_insights_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in contactcenterinsights_v1 instead of the aliases defined
-///     in this namespace.
-namespace contactcenterinsights {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use contactcenterinsights_v1::ContactCenterInsightsClient
-/// directly.
-using ::google::cloud::contactcenterinsights_v1::ContactCenterInsightsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace contactcenterinsights
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_CLIENT_H
diff --git a/google/cloud/contactcenterinsights/contact_center_insights_connection.h b/google/cloud/contactcenterinsights/contact_center_insights_connection.h
deleted file mode 100644
index 6b5c26f9b1a12..0000000000000
--- a/google/cloud/contactcenterinsights/contact_center_insights_connection.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_CONNECTION_H
-
-#include "google/cloud/contactcenterinsights/contact_center_insights_connection_idempotency_policy.h"
-#include "google/cloud/contactcenterinsights/v1/contact_center_insights_connection.h"
-
-namespace google {
-namespace cloud {
-namespace contactcenterinsights {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// contactcenterinsights_v1::MakeContactCenterInsightsConnection directly.
-using ::google::cloud::contactcenterinsights_v1::
-    MakeContactCenterInsightsConnection;
-
-/// @deprecated Use contactcenterinsights_v1::ContactCenterInsightsConnection
-/// directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsConnection;
-
-/// @deprecated Use
-/// contactcenterinsights_v1::ContactCenterInsightsLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// contactcenterinsights_v1::ContactCenterInsightsLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsLimitedTimeRetryPolicy;
-
-/// @deprecated Use contactcenterinsights_v1::ContactCenterInsightsRetryPolicy
-/// directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace contactcenterinsights
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_CONNECTION_H
diff --git a/google/cloud/contactcenterinsights/contact_center_insights_connection_idempotency_policy.h b/google/cloud/contactcenterinsights/contact_center_insights_connection_idempotency_policy.h
deleted file mode 100644
index 9bca83667e658..0000000000000
--- a/google/cloud/contactcenterinsights/contact_center_insights_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/contactcenterinsights/v1/contact_center_insights_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace contactcenterinsights {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// contactcenterinsights_v1::MakeDefaultContactCenterInsightsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::contactcenterinsights_v1::
-    MakeDefaultContactCenterInsightsConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// contactcenterinsights_v1::ContactCenterInsightsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace contactcenterinsights
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/contactcenterinsights/contact_center_insights_options.h b/google/cloud/contactcenterinsights/contact_center_insights_options.h
deleted file mode 100644
index 5c5654263c91f..0000000000000
--- a/google/cloud/contactcenterinsights/contact_center_insights_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_OPTIONS_H
-
-#include "google/cloud/contactcenterinsights/contact_center_insights_connection.h"
-#include "google/cloud/contactcenterinsights/contact_center_insights_connection_idempotency_policy.h"
-#include "google/cloud/contactcenterinsights/v1/contact_center_insights_options.h"
-
-namespace google {
-namespace cloud {
-namespace contactcenterinsights {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// contactcenterinsights_v1::ContactCenterInsightsPollingPolicyOption directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsPollingPolicyOption;
-
-/// @deprecated Use
-/// contactcenterinsights_v1::ContactCenterInsightsBackoffPolicyOption directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsBackoffPolicyOption;
-
-/// @deprecated Use
-/// contactcenterinsights_v1::ContactCenterInsightsConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// contactcenterinsights_v1::ContactCenterInsightsPolicyOptionList directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsPolicyOptionList;
-
-/// @deprecated Use
-/// contactcenterinsights_v1::ContactCenterInsightsRetryPolicyOption directly.
-using ::google::cloud::contactcenterinsights_v1::
-    ContactCenterInsightsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace contactcenterinsights
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_CONTACT_CENTER_INSIGHTS_OPTIONS_H
diff --git a/google/cloud/contactcenterinsights/mocks/mock_contact_center_insights_connection.h b/google/cloud/contactcenterinsights/mocks/mock_contact_center_insights_connection.h
deleted file mode 100644
index 33302ef8d27f6..0000000000000
--- a/google/cloud/contactcenterinsights/mocks/mock_contact_center_insights_connection.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_MOCKS_MOCK_CONTACT_CENTER_INSIGHTS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_MOCKS_MOCK_CONTACT_CENTER_INSIGHTS_CONNECTION_H
-
-#include "google/cloud/contactcenterinsights/contact_center_insights_connection.h"
-#include "google/cloud/contactcenterinsights/v1/mocks/mock_contact_center_insights_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in contactcenterinsights_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace contactcenterinsights_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// contactcenterinsights_v1_mocks::MockContactCenterInsightsConnection
-/// directly.
-using ::google::cloud::contactcenterinsights_v1_mocks::
-    MockContactCenterInsightsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace contactcenterinsights_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTACTCENTERINSIGHTS_MOCKS_MOCK_CONTACT_CENTER_INSIGHTS_CONNECTION_H
diff --git a/google/cloud/container/BUILD.bazel b/google/cloud/container/BUILD.bazel
index 2f22818e36883..2434390321951 100644
--- a/google/cloud/container/BUILD.bazel
+++ b/google/cloud/container/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/container/CMakeLists.txt b/google/cloud/container/CMakeLists.txt
index a48f47b0f5aae..0e59e74c3ec1a 100644
--- a/google/cloud/container/CMakeLists.txt
+++ b/google/cloud/container/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(container "Kubernetes Engine API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(container_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/container/cluster_manager_client.h b/google/cloud/container/cluster_manager_client.h
deleted file mode 100644
index 2cfc33bb0b1b3..0000000000000
--- a/google/cloud/container/cluster_manager_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/container/v1/cluster_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CLIENT_H
-
-#include "google/cloud/container/cluster_manager_connection.h"
-#include "google/cloud/container/v1/cluster_manager_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in container_v1 instead of the aliases defined in
-///     this namespace.
-namespace container {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use container_v1::ClusterManagerClient directly.
-using ::google::cloud::container_v1::ClusterManagerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace container
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CLIENT_H
diff --git a/google/cloud/container/cluster_manager_connection.h b/google/cloud/container/cluster_manager_connection.h
deleted file mode 100644
index c8d2146e75a5c..0000000000000
--- a/google/cloud/container/cluster_manager_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/container/v1/cluster_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_H
-
-#include "google/cloud/container/cluster_manager_connection_idempotency_policy.h"
-#include "google/cloud/container/v1/cluster_manager_connection.h"
-
-namespace google {
-namespace cloud {
-namespace container {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use container_v1::MakeClusterManagerConnection directly.
-using ::google::cloud::container_v1::MakeClusterManagerConnection;
-
-/// @deprecated Use container_v1::ClusterManagerConnection directly.
-using ::google::cloud::container_v1::ClusterManagerConnection;
-
-/// @deprecated Use container_v1::ClusterManagerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::container_v1::ClusterManagerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use container_v1::ClusterManagerLimitedTimeRetryPolicy directly.
-using ::google::cloud::container_v1::ClusterManagerLimitedTimeRetryPolicy;
-
-/// @deprecated Use container_v1::ClusterManagerRetryPolicy directly.
-using ::google::cloud::container_v1::ClusterManagerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace container
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_H
diff --git a/google/cloud/container/cluster_manager_connection_idempotency_policy.h b/google/cloud/container/cluster_manager_connection_idempotency_policy.h
deleted file mode 100644
index 9476103de4ad0..0000000000000
--- a/google/cloud/container/cluster_manager_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/container/v1/cluster_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace container {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// container_v1::MakeDefaultClusterManagerConnectionIdempotencyPolicy directly.
-using ::google::cloud::container_v1::
-    MakeDefaultClusterManagerConnectionIdempotencyPolicy;
-
-/// @deprecated Use container_v1::ClusterManagerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::container_v1::ClusterManagerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace container
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/container/cluster_manager_options.h b/google/cloud/container/cluster_manager_options.h
deleted file mode 100644
index 6e722b4ee47ea..0000000000000
--- a/google/cloud/container/cluster_manager_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/container/v1/cluster_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_OPTIONS_H
-
-#include "google/cloud/container/cluster_manager_connection.h"
-#include "google/cloud/container/cluster_manager_connection_idempotency_policy.h"
-#include "google/cloud/container/v1/cluster_manager_options.h"
-
-namespace google {
-namespace cloud {
-namespace container {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use container_v1::ClusterManagerBackoffPolicyOption directly.
-using ::google::cloud::container_v1::ClusterManagerBackoffPolicyOption;
-
-/// @deprecated Use
-/// container_v1::ClusterManagerConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::container_v1::
-    ClusterManagerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use container_v1::ClusterManagerPolicyOptionList directly.
-using ::google::cloud::container_v1::ClusterManagerPolicyOptionList;
-
-/// @deprecated Use container_v1::ClusterManagerRetryPolicyOption directly.
-using ::google::cloud::container_v1::ClusterManagerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace container
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_OPTIONS_H
diff --git a/google/cloud/container/mocks/mock_cluster_manager_connection.h b/google/cloud/container/mocks/mock_cluster_manager_connection.h
deleted file mode 100644
index 17f08ba5a0524..0000000000000
--- a/google/cloud/container/mocks/mock_cluster_manager_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/container/v1/cluster_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_MOCKS_MOCK_CLUSTER_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_MOCKS_MOCK_CLUSTER_MANAGER_CONNECTION_H
-
-#include "google/cloud/container/cluster_manager_connection.h"
-#include "google/cloud/container/v1/mocks/mock_cluster_manager_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in container_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace container_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use container_v1_mocks::MockClusterManagerConnection directly.
-using ::google::cloud::container_v1_mocks::MockClusterManagerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace container_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_MOCKS_MOCK_CLUSTER_MANAGER_CONNECTION_H
diff --git a/google/cloud/containeranalysis/BUILD.bazel b/google/cloud/containeranalysis/BUILD.bazel
index 668fe3f4bebf0..5b9a8a7d1384d 100644
--- a/google/cloud/containeranalysis/BUILD.bazel
+++ b/google/cloud/containeranalysis/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/containeranalysis/CMakeLists.txt b/google/cloud/containeranalysis/CMakeLists.txt
index 9a49ae976d0c4..c72d0536edb04 100644
--- a/google/cloud/containeranalysis/CMakeLists.txt
+++ b/google/cloud/containeranalysis/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     containeranalysis "Container Analysis API"
-    SERVICE_DIRS "__EMPTY__" "v1/"
+    SERVICE_DIRS "v1/"
     SHARED_PROTO_DEPS "grafeas")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
diff --git a/google/cloud/containeranalysis/container_analysis_client.h b/google/cloud/containeranalysis/container_analysis_client.h
deleted file mode 100644
index 3206ecbda3a37..0000000000000
--- a/google/cloud/containeranalysis/container_analysis_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/containeranalysis/v1/containeranalysis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_CLIENT_H
-
-#include "google/cloud/containeranalysis/container_analysis_connection.h"
-#include "google/cloud/containeranalysis/v1/container_analysis_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in containeranalysis_v1 instead of the aliases defined in
-///     this namespace.
-namespace containeranalysis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use containeranalysis_v1::ContainerAnalysisClient directly.
-using ::google::cloud::containeranalysis_v1::ContainerAnalysisClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_CLIENT_H
diff --git a/google/cloud/containeranalysis/container_analysis_connection.h b/google/cloud/containeranalysis/container_analysis_connection.h
deleted file mode 100644
index 5d041a82725af..0000000000000
--- a/google/cloud/containeranalysis/container_analysis_connection.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/containeranalysis/v1/containeranalysis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_CONNECTION_H
-
-#include "google/cloud/containeranalysis/container_analysis_connection_idempotency_policy.h"
-#include "google/cloud/containeranalysis/v1/container_analysis_connection.h"
-
-namespace google {
-namespace cloud {
-namespace containeranalysis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use containeranalysis_v1::MakeContainerAnalysisConnection
-/// directly.
-using ::google::cloud::containeranalysis_v1::MakeContainerAnalysisConnection;
-
-/// @deprecated Use containeranalysis_v1::ContainerAnalysisConnection directly.
-using ::google::cloud::containeranalysis_v1::ContainerAnalysisConnection;
-
-/// @deprecated Use
-/// containeranalysis_v1::ContainerAnalysisLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::containeranalysis_v1::
-    ContainerAnalysisLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// containeranalysis_v1::ContainerAnalysisLimitedTimeRetryPolicy directly.
-using ::google::cloud::containeranalysis_v1::
-    ContainerAnalysisLimitedTimeRetryPolicy;
-
-/// @deprecated Use containeranalysis_v1::ContainerAnalysisRetryPolicy directly.
-using ::google::cloud::containeranalysis_v1::ContainerAnalysisRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_CONNECTION_H
diff --git a/google/cloud/containeranalysis/container_analysis_connection_idempotency_policy.h b/google/cloud/containeranalysis/container_analysis_connection_idempotency_policy.h
deleted file mode 100644
index f470e99249080..0000000000000
--- a/google/cloud/containeranalysis/container_analysis_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/containeranalysis/v1/containeranalysis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/containeranalysis/v1/container_analysis_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace containeranalysis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// containeranalysis_v1::MakeDefaultContainerAnalysisConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::containeranalysis_v1::
-    MakeDefaultContainerAnalysisConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// containeranalysis_v1::ContainerAnalysisConnectionIdempotencyPolicy directly.
-using ::google::cloud::containeranalysis_v1::
-    ContainerAnalysisConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/containeranalysis/container_analysis_options.h b/google/cloud/containeranalysis/container_analysis_options.h
deleted file mode 100644
index 3155dccd131b6..0000000000000
--- a/google/cloud/containeranalysis/container_analysis_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/containeranalysis/v1/containeranalysis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_OPTIONS_H
-
-#include "google/cloud/containeranalysis/container_analysis_connection.h"
-#include "google/cloud/containeranalysis/container_analysis_connection_idempotency_policy.h"
-#include "google/cloud/containeranalysis/v1/container_analysis_options.h"
-
-namespace google {
-namespace cloud {
-namespace containeranalysis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use containeranalysis_v1::ContainerAnalysisBackoffPolicyOption
-/// directly.
-using ::google::cloud::containeranalysis_v1::
-    ContainerAnalysisBackoffPolicyOption;
-
-/// @deprecated Use
-/// containeranalysis_v1::ContainerAnalysisConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::containeranalysis_v1::
-    ContainerAnalysisConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use containeranalysis_v1::ContainerAnalysisPolicyOptionList
-/// directly.
-using ::google::cloud::containeranalysis_v1::ContainerAnalysisPolicyOptionList;
-
-/// @deprecated Use containeranalysis_v1::ContainerAnalysisRetryPolicyOption
-/// directly.
-using ::google::cloud::containeranalysis_v1::ContainerAnalysisRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_CONTAINER_ANALYSIS_OPTIONS_H
diff --git a/google/cloud/containeranalysis/grafeas_client.h b/google/cloud/containeranalysis/grafeas_client.h
deleted file mode 100644
index a0c498a947217..0000000000000
--- a/google/cloud/containeranalysis/grafeas_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: grafeas/v1/grafeas.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_CLIENT_H
-
-#include "google/cloud/containeranalysis/grafeas_connection.h"
-#include "google/cloud/containeranalysis/v1/grafeas_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in containeranalysis_v1 instead of the aliases defined in
-///     this namespace.
-namespace containeranalysis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use containeranalysis_v1::GrafeasClient directly.
-using ::google::cloud::containeranalysis_v1::GrafeasClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_CLIENT_H
diff --git a/google/cloud/containeranalysis/grafeas_connection.h b/google/cloud/containeranalysis/grafeas_connection.h
deleted file mode 100644
index 5063a359e95eb..0000000000000
--- a/google/cloud/containeranalysis/grafeas_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: grafeas/v1/grafeas.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_CONNECTION_H
-
-#include "google/cloud/containeranalysis/grafeas_connection_idempotency_policy.h"
-#include "google/cloud/containeranalysis/v1/grafeas_connection.h"
-
-namespace google {
-namespace cloud {
-namespace containeranalysis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use containeranalysis_v1::MakeGrafeasConnection directly.
-using ::google::cloud::containeranalysis_v1::MakeGrafeasConnection;
-
-/// @deprecated Use containeranalysis_v1::GrafeasConnection directly.
-using ::google::cloud::containeranalysis_v1::GrafeasConnection;
-
-/// @deprecated Use containeranalysis_v1::GrafeasLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::containeranalysis_v1::
-    GrafeasLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use containeranalysis_v1::GrafeasLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::containeranalysis_v1::GrafeasLimitedTimeRetryPolicy;
-
-/// @deprecated Use containeranalysis_v1::GrafeasRetryPolicy directly.
-using ::google::cloud::containeranalysis_v1::GrafeasRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_CONNECTION_H
diff --git a/google/cloud/containeranalysis/grafeas_connection_idempotency_policy.h b/google/cloud/containeranalysis/grafeas_connection_idempotency_policy.h
deleted file mode 100644
index 00119fd153c1b..0000000000000
--- a/google/cloud/containeranalysis/grafeas_connection_idempotency_policy.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: grafeas/v1/grafeas.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/containeranalysis/v1/grafeas_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace containeranalysis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// containeranalysis_v1::MakeDefaultGrafeasConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::containeranalysis_v1::
-    MakeDefaultGrafeasConnectionIdempotencyPolicy;
-
-/// @deprecated Use containeranalysis_v1::GrafeasConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::containeranalysis_v1::GrafeasConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/containeranalysis/grafeas_options.h b/google/cloud/containeranalysis/grafeas_options.h
deleted file mode 100644
index eb401b2f4cb0e..0000000000000
--- a/google/cloud/containeranalysis/grafeas_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: grafeas/v1/grafeas.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_OPTIONS_H
-
-#include "google/cloud/containeranalysis/grafeas_connection.h"
-#include "google/cloud/containeranalysis/grafeas_connection_idempotency_policy.h"
-#include "google/cloud/containeranalysis/v1/grafeas_options.h"
-
-namespace google {
-namespace cloud {
-namespace containeranalysis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use containeranalysis_v1::GrafeasBackoffPolicyOption directly.
-using ::google::cloud::containeranalysis_v1::GrafeasBackoffPolicyOption;
-
-/// @deprecated Use
-/// containeranalysis_v1::GrafeasConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::containeranalysis_v1::
-    GrafeasConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use containeranalysis_v1::GrafeasPolicyOptionList directly.
-using ::google::cloud::containeranalysis_v1::GrafeasPolicyOptionList;
-
-/// @deprecated Use containeranalysis_v1::GrafeasRetryPolicyOption directly.
-using ::google::cloud::containeranalysis_v1::GrafeasRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_GRAFEAS_OPTIONS_H
diff --git a/google/cloud/containeranalysis/mocks/mock_container_analysis_connection.h b/google/cloud/containeranalysis/mocks/mock_container_analysis_connection.h
deleted file mode 100644
index 021e4e6267ab1..0000000000000
--- a/google/cloud/containeranalysis/mocks/mock_container_analysis_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/containeranalysis/v1/containeranalysis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_MOCKS_MOCK_CONTAINER_ANALYSIS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_MOCKS_MOCK_CONTAINER_ANALYSIS_CONNECTION_H
-
-#include "google/cloud/containeranalysis/container_analysis_connection.h"
-#include "google/cloud/containeranalysis/v1/mocks/mock_container_analysis_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in containeranalysis_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace containeranalysis_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use containeranalysis_v1_mocks::MockContainerAnalysisConnection
-/// directly.
-using ::google::cloud::containeranalysis_v1_mocks::
-    MockContainerAnalysisConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_MOCKS_MOCK_CONTAINER_ANALYSIS_CONNECTION_H
diff --git a/google/cloud/containeranalysis/mocks/mock_grafeas_connection.h b/google/cloud/containeranalysis/mocks/mock_grafeas_connection.h
deleted file mode 100644
index f205f0fca3710..0000000000000
--- a/google/cloud/containeranalysis/mocks/mock_grafeas_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: grafeas/v1/grafeas.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_MOCKS_MOCK_GRAFEAS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_MOCKS_MOCK_GRAFEAS_CONNECTION_H
-
-#include "google/cloud/containeranalysis/grafeas_connection.h"
-#include "google/cloud/containeranalysis/v1/mocks/mock_grafeas_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in containeranalysis_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace containeranalysis_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use containeranalysis_v1_mocks::MockGrafeasConnection directly.
-using ::google::cloud::containeranalysis_v1_mocks::MockGrafeasConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace containeranalysis_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINERANALYSIS_MOCKS_MOCK_GRAFEAS_CONNECTION_H
diff --git a/google/cloud/datacatalog/BUILD.bazel b/google/cloud/datacatalog/BUILD.bazel
index 1281ce86c074d..33b9439cb6b3d 100644
--- a/google/cloud/datacatalog/BUILD.bazel
+++ b/google/cloud/datacatalog/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "lineage/v1/",
     "v1/",
 ]
diff --git a/google/cloud/datacatalog/CMakeLists.txt b/google/cloud/datacatalog/CMakeLists.txt
index b4d7349a95348..bb913f2394157 100644
--- a/google/cloud/datacatalog/CMakeLists.txt
+++ b/google/cloud/datacatalog/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(datacatalog "Google Cloud Data Catalog API"
-                                   SERVICE_DIRS "__EMPTY__" "lineage/v1/" "v1/")
+                                   SERVICE_DIRS "lineage/v1/" "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(datacatalog_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/datacatalog/data_catalog_client.h b/google/cloud/datacatalog/data_catalog_client.h
deleted file mode 100644
index 15b940e0e6713..0000000000000
--- a/google/cloud/datacatalog/data_catalog_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/datacatalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_CLIENT_H
-
-#include "google/cloud/datacatalog/data_catalog_connection.h"
-#include "google/cloud/datacatalog/v1/data_catalog_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datacatalog_v1 instead of the aliases defined in
-///     this namespace.
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1::DataCatalogClient directly.
-using ::google::cloud::datacatalog_v1::DataCatalogClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_CLIENT_H
diff --git a/google/cloud/datacatalog/data_catalog_connection.h b/google/cloud/datacatalog/data_catalog_connection.h
deleted file mode 100644
index 8c475a57951c9..0000000000000
--- a/google/cloud/datacatalog/data_catalog_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/datacatalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_CONNECTION_H
-
-#include "google/cloud/datacatalog/data_catalog_connection_idempotency_policy.h"
-#include "google/cloud/datacatalog/v1/data_catalog_connection.h"
-
-namespace google {
-namespace cloud {
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1::MakeDataCatalogConnection directly.
-using ::google::cloud::datacatalog_v1::MakeDataCatalogConnection;
-
-/// @deprecated Use datacatalog_v1::DataCatalogConnection directly.
-using ::google::cloud::datacatalog_v1::DataCatalogConnection;
-
-/// @deprecated Use datacatalog_v1::DataCatalogLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::DataCatalogLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use datacatalog_v1::DataCatalogLimitedTimeRetryPolicy directly.
-using ::google::cloud::datacatalog_v1::DataCatalogLimitedTimeRetryPolicy;
-
-/// @deprecated Use datacatalog_v1::DataCatalogRetryPolicy directly.
-using ::google::cloud::datacatalog_v1::DataCatalogRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_CONNECTION_H
diff --git a/google/cloud/datacatalog/data_catalog_connection_idempotency_policy.h b/google/cloud/datacatalog/data_catalog_connection_idempotency_policy.h
deleted file mode 100644
index 25b4a013ba3c1..0000000000000
--- a/google/cloud/datacatalog/data_catalog_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/datacatalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/datacatalog/v1/data_catalog_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// datacatalog_v1::MakeDefaultDataCatalogConnectionIdempotencyPolicy directly.
-using ::google::cloud::datacatalog_v1::
-    MakeDefaultDataCatalogConnectionIdempotencyPolicy;
-
-/// @deprecated Use datacatalog_v1::DataCatalogConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::DataCatalogConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/datacatalog/data_catalog_options.h b/google/cloud/datacatalog/data_catalog_options.h
deleted file mode 100644
index 6bb9d41b0247a..0000000000000
--- a/google/cloud/datacatalog/data_catalog_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/datacatalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_OPTIONS_H
-
-#include "google/cloud/datacatalog/data_catalog_connection.h"
-#include "google/cloud/datacatalog/data_catalog_connection_idempotency_policy.h"
-#include "google/cloud/datacatalog/v1/data_catalog_options.h"
-
-namespace google {
-namespace cloud {
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1::DataCatalogPollingPolicyOption directly.
-using ::google::cloud::datacatalog_v1::DataCatalogPollingPolicyOption;
-
-/// @deprecated Use datacatalog_v1::DataCatalogBackoffPolicyOption directly.
-using ::google::cloud::datacatalog_v1::DataCatalogBackoffPolicyOption;
-
-/// @deprecated Use datacatalog_v1::DataCatalogConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    DataCatalogConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use datacatalog_v1::DataCatalogPolicyOptionList directly.
-using ::google::cloud::datacatalog_v1::DataCatalogPolicyOptionList;
-
-/// @deprecated Use datacatalog_v1::DataCatalogRetryPolicyOption directly.
-using ::google::cloud::datacatalog_v1::DataCatalogRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_DATA_CATALOG_OPTIONS_H
diff --git a/google/cloud/datacatalog/mocks/mock_data_catalog_connection.h b/google/cloud/datacatalog/mocks/mock_data_catalog_connection.h
deleted file mode 100644
index 0aae3a14df6b7..0000000000000
--- a/google/cloud/datacatalog/mocks/mock_data_catalog_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/datacatalog.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_MOCKS_MOCK_DATA_CATALOG_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_MOCKS_MOCK_DATA_CATALOG_CONNECTION_H
-
-#include "google/cloud/datacatalog/data_catalog_connection.h"
-#include "google/cloud/datacatalog/v1/mocks/mock_data_catalog_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datacatalog_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace datacatalog_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1_mocks::MockDataCatalogConnection directly.
-using ::google::cloud::datacatalog_v1_mocks::MockDataCatalogConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_MOCKS_MOCK_DATA_CATALOG_CONNECTION_H
diff --git a/google/cloud/datacatalog/mocks/mock_policy_tag_manager_connection.h b/google/cloud/datacatalog/mocks/mock_policy_tag_manager_connection.h
deleted file mode 100644
index 528f997ae60c2..0000000000000
--- a/google/cloud/datacatalog/mocks/mock_policy_tag_manager_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_MOCKS_MOCK_POLICY_TAG_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_MOCKS_MOCK_POLICY_TAG_MANAGER_CONNECTION_H
-
-#include "google/cloud/datacatalog/policy_tag_manager_connection.h"
-#include "google/cloud/datacatalog/v1/mocks/mock_policy_tag_manager_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datacatalog_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace datacatalog_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1_mocks::MockPolicyTagManagerConnection
-/// directly.
-using ::google::cloud::datacatalog_v1_mocks::MockPolicyTagManagerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_MOCKS_MOCK_POLICY_TAG_MANAGER_CONNECTION_H
diff --git a/google/cloud/datacatalog/mocks/mock_policy_tag_manager_serialization_connection.h b/google/cloud/datacatalog/mocks/mock_policy_tag_manager_serialization_connection.h
deleted file mode 100644
index 5b22812dd5a08..0000000000000
--- a/google/cloud/datacatalog/mocks/mock_policy_tag_manager_serialization_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_MOCKS_MOCK_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_MOCKS_MOCK_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_H
-
-#include "google/cloud/datacatalog/policy_tag_manager_serialization_connection.h"
-#include "google/cloud/datacatalog/v1/mocks/mock_policy_tag_manager_serialization_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datacatalog_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace datacatalog_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// datacatalog_v1_mocks::MockPolicyTagManagerSerializationConnection directly.
-using ::google::cloud::datacatalog_v1_mocks::
-    MockPolicyTagManagerSerializationConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_MOCKS_MOCK_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_H
diff --git a/google/cloud/datacatalog/policy_tag_manager_client.h b/google/cloud/datacatalog/policy_tag_manager_client.h
deleted file mode 100644
index 27cad84c2632d..0000000000000
--- a/google/cloud/datacatalog/policy_tag_manager_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_CLIENT_H
-
-#include "google/cloud/datacatalog/policy_tag_manager_connection.h"
-#include "google/cloud/datacatalog/v1/policy_tag_manager_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datacatalog_v1 instead of the aliases defined in
-///     this namespace.
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerClient directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_CLIENT_H
diff --git a/google/cloud/datacatalog/policy_tag_manager_connection.h b/google/cloud/datacatalog/policy_tag_manager_connection.h
deleted file mode 100644
index 5e49928394ea5..0000000000000
--- a/google/cloud/datacatalog/policy_tag_manager_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_CONNECTION_H
-
-#include "google/cloud/datacatalog/policy_tag_manager_connection_idempotency_policy.h"
-#include "google/cloud/datacatalog/v1/policy_tag_manager_connection.h"
-
-namespace google {
-namespace cloud {
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1::MakePolicyTagManagerConnection directly.
-using ::google::cloud::datacatalog_v1::MakePolicyTagManagerConnection;
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerConnection directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerConnection;
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerLimitedTimeRetryPolicy;
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerRetryPolicy directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_CONNECTION_H
diff --git a/google/cloud/datacatalog/policy_tag_manager_connection_idempotency_policy.h b/google/cloud/datacatalog/policy_tag_manager_connection_idempotency_policy.h
deleted file mode 100644
index c18a7f71447c2..0000000000000
--- a/google/cloud/datacatalog/policy_tag_manager_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/datacatalog/v1/policy_tag_manager_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// datacatalog_v1::MakeDefaultPolicyTagManagerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    MakeDefaultPolicyTagManagerConnectionIdempotencyPolicy;
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/datacatalog/policy_tag_manager_options.h b/google/cloud/datacatalog/policy_tag_manager_options.h
deleted file mode 100644
index d8f7c18f42ba2..0000000000000
--- a/google/cloud/datacatalog/policy_tag_manager_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_OPTIONS_H
-
-#include "google/cloud/datacatalog/policy_tag_manager_connection.h"
-#include "google/cloud/datacatalog/policy_tag_manager_connection_idempotency_policy.h"
-#include "google/cloud/datacatalog/v1/policy_tag_manager_options.h"
-
-namespace google {
-namespace cloud {
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerBackoffPolicyOption
-/// directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerBackoffPolicyOption;
-
-/// @deprecated Use
-/// datacatalog_v1::PolicyTagManagerConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerPolicyOptionList directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerPolicyOptionList;
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerRetryPolicyOption directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_OPTIONS_H
diff --git a/google/cloud/datacatalog/policy_tag_manager_serialization_client.h b/google/cloud/datacatalog/policy_tag_manager_serialization_client.h
deleted file mode 100644
index 5f2bac534fe20..0000000000000
--- a/google/cloud/datacatalog/policy_tag_manager_serialization_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_CLIENT_H
-
-#include "google/cloud/datacatalog/policy_tag_manager_serialization_connection.h"
-#include "google/cloud/datacatalog/v1/policy_tag_manager_serialization_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datacatalog_v1 instead of the aliases defined in
-///     this namespace.
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerSerializationClient
-/// directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerSerializationClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_CLIENT_H
diff --git a/google/cloud/datacatalog/policy_tag_manager_serialization_connection.h b/google/cloud/datacatalog/policy_tag_manager_serialization_connection.h
deleted file mode 100644
index bc2440632f89c..0000000000000
--- a/google/cloud/datacatalog/policy_tag_manager_serialization_connection.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_H
-
-#include "google/cloud/datacatalog/policy_tag_manager_serialization_connection_idempotency_policy.h"
-#include "google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection.h"
-
-namespace google {
-namespace cloud {
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datacatalog_v1::MakePolicyTagManagerSerializationConnection
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    MakePolicyTagManagerSerializationConnection;
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerSerializationConnection
-/// directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerSerializationConnection;
-
-/// @deprecated Use
-/// datacatalog_v1::PolicyTagManagerSerializationLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerSerializationLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// datacatalog_v1::PolicyTagManagerSerializationLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerSerializationLimitedTimeRetryPolicy;
-
-/// @deprecated Use datacatalog_v1::PolicyTagManagerSerializationRetryPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::PolicyTagManagerSerializationRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_H
diff --git a/google/cloud/datacatalog/policy_tag_manager_serialization_connection_idempotency_policy.h b/google/cloud/datacatalog/policy_tag_manager_serialization_connection_idempotency_policy.h
deleted file mode 100644
index eb29b0933339d..0000000000000
--- a/google/cloud/datacatalog/policy_tag_manager_serialization_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/datacatalog/v1/policy_tag_manager_serialization_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// datacatalog_v1::MakeDefaultPolicyTagManagerSerializationConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    MakeDefaultPolicyTagManagerSerializationConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// datacatalog_v1::PolicyTagManagerSerializationConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerSerializationConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/datacatalog/policy_tag_manager_serialization_options.h b/google/cloud/datacatalog/policy_tag_manager_serialization_options.h
deleted file mode 100644
index 95bf790320221..0000000000000
--- a/google/cloud/datacatalog/policy_tag_manager_serialization_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_OPTIONS_H
-
-#include "google/cloud/datacatalog/policy_tag_manager_serialization_connection.h"
-#include "google/cloud/datacatalog/policy_tag_manager_serialization_connection_idempotency_policy.h"
-#include "google/cloud/datacatalog/v1/policy_tag_manager_serialization_options.h"
-
-namespace google {
-namespace cloud {
-namespace datacatalog {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// datacatalog_v1::PolicyTagManagerSerializationBackoffPolicyOption directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerSerializationBackoffPolicyOption;
-
-/// @deprecated Use
-/// datacatalog_v1::PolicyTagManagerSerializationConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerSerializationConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// datacatalog_v1::PolicyTagManagerSerializationPolicyOptionList directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerSerializationPolicyOptionList;
-
-/// @deprecated Use
-/// datacatalog_v1::PolicyTagManagerSerializationRetryPolicyOption directly.
-using ::google::cloud::datacatalog_v1::
-    PolicyTagManagerSerializationRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datacatalog
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATACATALOG_POLICY_TAG_MANAGER_SERIALIZATION_OPTIONS_H
diff --git a/google/cloud/datamigration/BUILD.bazel b/google/cloud/datamigration/BUILD.bazel
index 621483f2556c0..d4dc162637afc 100644
--- a/google/cloud/datamigration/BUILD.bazel
+++ b/google/cloud/datamigration/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/datamigration/CMakeLists.txt b/google/cloud/datamigration/CMakeLists.txt
index f8a58f2775cd5..98905df924456 100644
--- a/google/cloud/datamigration/CMakeLists.txt
+++ b/google/cloud/datamigration/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(datamigration "Database Migration API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(datamigration_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/datamigration/data_migration_client.h b/google/cloud/datamigration/data_migration_client.h
deleted file mode 100644
index 4ddf58b668a24..0000000000000
--- a/google/cloud/datamigration/data_migration_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/clouddms/v1/clouddms.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_CLIENT_H
-
-#include "google/cloud/datamigration/data_migration_connection.h"
-#include "google/cloud/datamigration/v1/data_migration_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datamigration_v1 instead of the aliases defined in
-///     this namespace.
-namespace datamigration {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datamigration_v1::DataMigrationServiceClient directly.
-using ::google::cloud::datamigration_v1::DataMigrationServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datamigration
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_CLIENT_H
diff --git a/google/cloud/datamigration/data_migration_connection.h b/google/cloud/datamigration/data_migration_connection.h
deleted file mode 100644
index 56e2e5041a5b2..0000000000000
--- a/google/cloud/datamigration/data_migration_connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/clouddms/v1/clouddms.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_CONNECTION_H
-
-#include "google/cloud/datamigration/data_migration_connection_idempotency_policy.h"
-#include "google/cloud/datamigration/v1/data_migration_connection.h"
-
-namespace google {
-namespace cloud {
-namespace datamigration {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datamigration_v1::MakeDataMigrationServiceConnection
-/// directly.
-using ::google::cloud::datamigration_v1::MakeDataMigrationServiceConnection;
-
-/// @deprecated Use datamigration_v1::DataMigrationServiceConnection directly.
-using ::google::cloud::datamigration_v1::DataMigrationServiceConnection;
-
-/// @deprecated Use
-/// datamigration_v1::DataMigrationServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::datamigration_v1::
-    DataMigrationServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use datamigration_v1::DataMigrationServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::datamigration_v1::
-    DataMigrationServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use datamigration_v1::DataMigrationServiceRetryPolicy directly.
-using ::google::cloud::datamigration_v1::DataMigrationServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datamigration
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_CONNECTION_H
diff --git a/google/cloud/datamigration/data_migration_connection_idempotency_policy.h b/google/cloud/datamigration/data_migration_connection_idempotency_policy.h
deleted file mode 100644
index 3105678972b21..0000000000000
--- a/google/cloud/datamigration/data_migration_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/clouddms/v1/clouddms.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/datamigration/v1/data_migration_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace datamigration {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// datamigration_v1::MakeDefaultDataMigrationServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::datamigration_v1::
-    MakeDefaultDataMigrationServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// datamigration_v1::DataMigrationServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::datamigration_v1::
-    DataMigrationServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datamigration
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/datamigration/data_migration_options.h b/google/cloud/datamigration/data_migration_options.h
deleted file mode 100644
index a62307a49afe3..0000000000000
--- a/google/cloud/datamigration/data_migration_options.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/clouddms/v1/clouddms.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_OPTIONS_H
-
-#include "google/cloud/datamigration/data_migration_connection.h"
-#include "google/cloud/datamigration/data_migration_connection_idempotency_policy.h"
-#include "google/cloud/datamigration/v1/data_migration_options.h"
-
-namespace google {
-namespace cloud {
-namespace datamigration {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datamigration_v1::DataMigrationServicePollingPolicyOption
-/// directly.
-using ::google::cloud::datamigration_v1::
-    DataMigrationServicePollingPolicyOption;
-
-/// @deprecated Use datamigration_v1::DataMigrationServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::datamigration_v1::
-    DataMigrationServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// datamigration_v1::DataMigrationServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::datamigration_v1::
-    DataMigrationServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use datamigration_v1::DataMigrationServicePolicyOptionList
-/// directly.
-using ::google::cloud::datamigration_v1::DataMigrationServicePolicyOptionList;
-
-/// @deprecated Use datamigration_v1::DataMigrationServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::datamigration_v1::DataMigrationServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datamigration
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_DATA_MIGRATION_OPTIONS_H
diff --git a/google/cloud/datamigration/mocks/mock_data_migration_connection.h b/google/cloud/datamigration/mocks/mock_data_migration_connection.h
deleted file mode 100644
index 868c5502db110..0000000000000
--- a/google/cloud/datamigration/mocks/mock_data_migration_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/clouddms/v1/clouddms.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_MOCKS_MOCK_DATA_MIGRATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_MOCKS_MOCK_DATA_MIGRATION_CONNECTION_H
-
-#include "google/cloud/datamigration/data_migration_connection.h"
-#include "google/cloud/datamigration/v1/mocks/mock_data_migration_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datamigration_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace datamigration_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datamigration_v1_mocks::MockDataMigrationServiceConnection
-/// directly.
-using ::google::cloud::datamigration_v1_mocks::
-    MockDataMigrationServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datamigration_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAMIGRATION_MOCKS_MOCK_DATA_MIGRATION_CONNECTION_H
diff --git a/google/cloud/dataplex/BUILD.bazel b/google/cloud/dataplex/BUILD.bazel
index aac25138e50fa..9452165e490ac 100644
--- a/google/cloud/dataplex/BUILD.bazel
+++ b/google/cloud/dataplex/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/dataplex/CMakeLists.txt b/google/cloud/dataplex/CMakeLists.txt
index c749a81416852..ec4d0c413ae8c 100644
--- a/google/cloud/dataplex/CMakeLists.txt
+++ b/google/cloud/dataplex/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(dataplex "Cloud Dataplex API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(dataplex_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/dataplex/content_client.h b/google/cloud/dataplex/content_client.h
deleted file mode 100644
index e543583aef8f0..0000000000000
--- a/google/cloud/dataplex/content_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/content.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_CLIENT_H
-
-#include "google/cloud/dataplex/content_connection.h"
-#include "google/cloud/dataplex/v1/content_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataplex_v1 instead of the aliases defined in
-///     this namespace.
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1::ContentServiceClient directly.
-using ::google::cloud::dataplex_v1::ContentServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_CLIENT_H
diff --git a/google/cloud/dataplex/content_connection.h b/google/cloud/dataplex/content_connection.h
deleted file mode 100644
index f21b1a7c56d6f..0000000000000
--- a/google/cloud/dataplex/content_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/content.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_CONNECTION_H
-
-#include "google/cloud/dataplex/content_connection_idempotency_policy.h"
-#include "google/cloud/dataplex/v1/content_connection.h"
-
-namespace google {
-namespace cloud {
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1::MakeContentServiceConnection directly.
-using ::google::cloud::dataplex_v1::MakeContentServiceConnection;
-
-/// @deprecated Use dataplex_v1::ContentServiceConnection directly.
-using ::google::cloud::dataplex_v1::ContentServiceConnection;
-
-/// @deprecated Use dataplex_v1::ContentServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::dataplex_v1::ContentServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use dataplex_v1::ContentServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::dataplex_v1::ContentServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use dataplex_v1::ContentServiceRetryPolicy directly.
-using ::google::cloud::dataplex_v1::ContentServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_CONNECTION_H
diff --git a/google/cloud/dataplex/content_connection_idempotency_policy.h b/google/cloud/dataplex/content_connection_idempotency_policy.h
deleted file mode 100644
index 2b9fdaaa02913..0000000000000
--- a/google/cloud/dataplex/content_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/content.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/dataplex/v1/content_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// dataplex_v1::MakeDefaultContentServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::dataplex_v1::
-    MakeDefaultContentServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use dataplex_v1::ContentServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dataplex_v1::ContentServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/dataplex/content_options.h b/google/cloud/dataplex/content_options.h
deleted file mode 100644
index b2e4272b3247d..0000000000000
--- a/google/cloud/dataplex/content_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/content.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_OPTIONS_H
-
-#include "google/cloud/dataplex/content_connection.h"
-#include "google/cloud/dataplex/content_connection_idempotency_policy.h"
-#include "google/cloud/dataplex/v1/content_options.h"
-
-namespace google {
-namespace cloud {
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1::ContentServiceBackoffPolicyOption directly.
-using ::google::cloud::dataplex_v1::ContentServiceBackoffPolicyOption;
-
-/// @deprecated Use dataplex_v1::ContentServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::dataplex_v1::
-    ContentServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use dataplex_v1::ContentServicePolicyOptionList directly.
-using ::google::cloud::dataplex_v1::ContentServicePolicyOptionList;
-
-/// @deprecated Use dataplex_v1::ContentServiceRetryPolicyOption directly.
-using ::google::cloud::dataplex_v1::ContentServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_CONTENT_OPTIONS_H
diff --git a/google/cloud/dataplex/dataplex_client.h b/google/cloud/dataplex/dataplex_client.h
deleted file mode 100644
index 739cac37619be..0000000000000
--- a/google/cloud/dataplex/dataplex_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_CLIENT_H
-
-#include "google/cloud/dataplex/dataplex_connection.h"
-#include "google/cloud/dataplex/v1/dataplex_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataplex_v1 instead of the aliases defined in
-///     this namespace.
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1::DataplexServiceClient directly.
-using ::google::cloud::dataplex_v1::DataplexServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_CLIENT_H
diff --git a/google/cloud/dataplex/dataplex_connection.h b/google/cloud/dataplex/dataplex_connection.h
deleted file mode 100644
index 9cf367b268f7c..0000000000000
--- a/google/cloud/dataplex/dataplex_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_CONNECTION_H
-
-#include "google/cloud/dataplex/dataplex_connection_idempotency_policy.h"
-#include "google/cloud/dataplex/v1/dataplex_connection.h"
-
-namespace google {
-namespace cloud {
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1::MakeDataplexServiceConnection directly.
-using ::google::cloud::dataplex_v1::MakeDataplexServiceConnection;
-
-/// @deprecated Use dataplex_v1::DataplexServiceConnection directly.
-using ::google::cloud::dataplex_v1::DataplexServiceConnection;
-
-/// @deprecated Use dataplex_v1::DataplexServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::dataplex_v1::DataplexServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use dataplex_v1::DataplexServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::dataplex_v1::DataplexServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use dataplex_v1::DataplexServiceRetryPolicy directly.
-using ::google::cloud::dataplex_v1::DataplexServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_CONNECTION_H
diff --git a/google/cloud/dataplex/dataplex_connection_idempotency_policy.h b/google/cloud/dataplex/dataplex_connection_idempotency_policy.h
deleted file mode 100644
index 5be5941da8fed..0000000000000
--- a/google/cloud/dataplex/dataplex_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/dataplex/v1/dataplex_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// dataplex_v1::MakeDefaultDataplexServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::dataplex_v1::
-    MakeDefaultDataplexServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use dataplex_v1::DataplexServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dataplex_v1::DataplexServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/dataplex/dataplex_options.h b/google/cloud/dataplex/dataplex_options.h
deleted file mode 100644
index a1977fe3e3a1d..0000000000000
--- a/google/cloud/dataplex/dataplex_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_OPTIONS_H
-
-#include "google/cloud/dataplex/dataplex_connection.h"
-#include "google/cloud/dataplex/dataplex_connection_idempotency_policy.h"
-#include "google/cloud/dataplex/v1/dataplex_options.h"
-
-namespace google {
-namespace cloud {
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1::DataplexServicePollingPolicyOption directly.
-using ::google::cloud::dataplex_v1::DataplexServicePollingPolicyOption;
-
-/// @deprecated Use dataplex_v1::DataplexServiceBackoffPolicyOption directly.
-using ::google::cloud::dataplex_v1::DataplexServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// dataplex_v1::DataplexServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::dataplex_v1::
-    DataplexServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use dataplex_v1::DataplexServicePolicyOptionList directly.
-using ::google::cloud::dataplex_v1::DataplexServicePolicyOptionList;
-
-/// @deprecated Use dataplex_v1::DataplexServiceRetryPolicyOption directly.
-using ::google::cloud::dataplex_v1::DataplexServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_DATAPLEX_OPTIONS_H
diff --git a/google/cloud/dataplex/metadata_client.h b/google/cloud/dataplex/metadata_client.h
deleted file mode 100644
index cfc4fad6c5624..0000000000000
--- a/google/cloud/dataplex/metadata_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/metadata.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_CLIENT_H
-
-#include "google/cloud/dataplex/metadata_connection.h"
-#include "google/cloud/dataplex/v1/metadata_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataplex_v1 instead of the aliases defined in
-///     this namespace.
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1::MetadataServiceClient directly.
-using ::google::cloud::dataplex_v1::MetadataServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_CLIENT_H
diff --git a/google/cloud/dataplex/metadata_connection.h b/google/cloud/dataplex/metadata_connection.h
deleted file mode 100644
index c52b005997f46..0000000000000
--- a/google/cloud/dataplex/metadata_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/metadata.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_CONNECTION_H
-
-#include "google/cloud/dataplex/metadata_connection_idempotency_policy.h"
-#include "google/cloud/dataplex/v1/metadata_connection.h"
-
-namespace google {
-namespace cloud {
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1::MakeMetadataServiceConnection directly.
-using ::google::cloud::dataplex_v1::MakeMetadataServiceConnection;
-
-/// @deprecated Use dataplex_v1::MetadataServiceConnection directly.
-using ::google::cloud::dataplex_v1::MetadataServiceConnection;
-
-/// @deprecated Use dataplex_v1::MetadataServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::dataplex_v1::MetadataServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use dataplex_v1::MetadataServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::dataplex_v1::MetadataServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use dataplex_v1::MetadataServiceRetryPolicy directly.
-using ::google::cloud::dataplex_v1::MetadataServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_CONNECTION_H
diff --git a/google/cloud/dataplex/metadata_connection_idempotency_policy.h b/google/cloud/dataplex/metadata_connection_idempotency_policy.h
deleted file mode 100644
index 7677da69a9ac8..0000000000000
--- a/google/cloud/dataplex/metadata_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/metadata.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/dataplex/v1/metadata_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// dataplex_v1::MakeDefaultMetadataServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::dataplex_v1::
-    MakeDefaultMetadataServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use dataplex_v1::MetadataServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dataplex_v1::MetadataServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/dataplex/metadata_options.h b/google/cloud/dataplex/metadata_options.h
deleted file mode 100644
index a6c4a2e7130bd..0000000000000
--- a/google/cloud/dataplex/metadata_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/metadata.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_OPTIONS_H
-
-#include "google/cloud/dataplex/metadata_connection.h"
-#include "google/cloud/dataplex/metadata_connection_idempotency_policy.h"
-#include "google/cloud/dataplex/v1/metadata_options.h"
-
-namespace google {
-namespace cloud {
-namespace dataplex {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1::MetadataServiceBackoffPolicyOption directly.
-using ::google::cloud::dataplex_v1::MetadataServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// dataplex_v1::MetadataServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::dataplex_v1::
-    MetadataServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use dataplex_v1::MetadataServicePolicyOptionList directly.
-using ::google::cloud::dataplex_v1::MetadataServicePolicyOptionList;
-
-/// @deprecated Use dataplex_v1::MetadataServiceRetryPolicyOption directly.
-using ::google::cloud::dataplex_v1::MetadataServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_METADATA_OPTIONS_H
diff --git a/google/cloud/dataplex/mocks/mock_content_connection.h b/google/cloud/dataplex/mocks/mock_content_connection.h
deleted file mode 100644
index d2fb4aa834cbb..0000000000000
--- a/google/cloud/dataplex/mocks/mock_content_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/content.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_MOCKS_MOCK_CONTENT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_MOCKS_MOCK_CONTENT_CONNECTION_H
-
-#include "google/cloud/dataplex/content_connection.h"
-#include "google/cloud/dataplex/v1/mocks/mock_content_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataplex_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace dataplex_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1_mocks::MockContentServiceConnection directly.
-using ::google::cloud::dataplex_v1_mocks::MockContentServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_MOCKS_MOCK_CONTENT_CONNECTION_H
diff --git a/google/cloud/dataplex/mocks/mock_dataplex_connection.h b/google/cloud/dataplex/mocks/mock_dataplex_connection.h
deleted file mode 100644
index a2c220ba8d874..0000000000000
--- a/google/cloud/dataplex/mocks/mock_dataplex_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_MOCKS_MOCK_DATAPLEX_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_MOCKS_MOCK_DATAPLEX_CONNECTION_H
-
-#include "google/cloud/dataplex/dataplex_connection.h"
-#include "google/cloud/dataplex/v1/mocks/mock_dataplex_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataplex_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace dataplex_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1_mocks::MockDataplexServiceConnection directly.
-using ::google::cloud::dataplex_v1_mocks::MockDataplexServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_MOCKS_MOCK_DATAPLEX_CONNECTION_H
diff --git a/google/cloud/dataplex/mocks/mock_metadata_connection.h b/google/cloud/dataplex/mocks/mock_metadata_connection.h
deleted file mode 100644
index df37b51ff45cb..0000000000000
--- a/google/cloud/dataplex/mocks/mock_metadata_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataplex/v1/metadata.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_MOCKS_MOCK_METADATA_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_MOCKS_MOCK_METADATA_CONNECTION_H
-
-#include "google/cloud/dataplex/metadata_connection.h"
-#include "google/cloud/dataplex/v1/mocks/mock_metadata_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataplex_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace dataplex_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataplex_v1_mocks::MockMetadataServiceConnection directly.
-using ::google::cloud::dataplex_v1_mocks::MockMetadataServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataplex_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPLEX_MOCKS_MOCK_METADATA_CONNECTION_H
diff --git a/google/cloud/dataproc/BUILD.bazel b/google/cloud/dataproc/BUILD.bazel
index 48d6ef08d7520..d0ed32571c296 100644
--- a/google/cloud/dataproc/BUILD.bazel
+++ b/google/cloud/dataproc/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/dataproc/CMakeLists.txt b/google/cloud/dataproc/CMakeLists.txt
index b49c7ddf0216f..b19f3a6af2cc0 100644
--- a/google/cloud/dataproc/CMakeLists.txt
+++ b/google/cloud/dataproc/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(dataproc "Cloud Dataproc API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(dataproc_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/dataproc/autoscaling_policy_client.h b/google/cloud/dataproc/autoscaling_policy_client.h
deleted file mode 100644
index f5e12a6a7390e..0000000000000
--- a/google/cloud/dataproc/autoscaling_policy_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/autoscaling_policies.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_CLIENT_H
-
-#include "google/cloud/dataproc/autoscaling_policy_connection.h"
-#include "google/cloud/dataproc/v1/autoscaling_policy_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1 instead of the aliases defined in
-///     this namespace.
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::AutoscalingPolicyServiceClient directly.
-using ::google::cloud::dataproc_v1::AutoscalingPolicyServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_CLIENT_H
diff --git a/google/cloud/dataproc/autoscaling_policy_connection.h b/google/cloud/dataproc/autoscaling_policy_connection.h
deleted file mode 100644
index 44132df27d903..0000000000000
--- a/google/cloud/dataproc/autoscaling_policy_connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/autoscaling_policies.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_CONNECTION_H
-
-#include "google/cloud/dataproc/autoscaling_policy_connection_idempotency_policy.h"
-#include "google/cloud/dataproc/v1/autoscaling_policy_connection.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::MakeAutoscalingPolicyServiceConnection
-/// directly.
-using ::google::cloud::dataproc_v1::MakeAutoscalingPolicyServiceConnection;
-
-/// @deprecated Use dataproc_v1::AutoscalingPolicyServiceConnection directly.
-using ::google::cloud::dataproc_v1::AutoscalingPolicyServiceConnection;
-
-/// @deprecated Use
-/// dataproc_v1::AutoscalingPolicyServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::dataproc_v1::
-    AutoscalingPolicyServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use dataproc_v1::AutoscalingPolicyServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::
-    AutoscalingPolicyServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use dataproc_v1::AutoscalingPolicyServiceRetryPolicy directly.
-using ::google::cloud::dataproc_v1::AutoscalingPolicyServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_CONNECTION_H
diff --git a/google/cloud/dataproc/autoscaling_policy_connection_idempotency_policy.h b/google/cloud/dataproc/autoscaling_policy_connection_idempotency_policy.h
deleted file mode 100644
index a2bad9f973914..0000000000000
--- a/google/cloud/dataproc/autoscaling_policy_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/autoscaling_policies.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/dataproc/v1/autoscaling_policy_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// dataproc_v1::MakeDefaultAutoscalingPolicyServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::
-    MakeDefaultAutoscalingPolicyServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// dataproc_v1::AutoscalingPolicyServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::dataproc_v1::
-    AutoscalingPolicyServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/dataproc/autoscaling_policy_options.h b/google/cloud/dataproc/autoscaling_policy_options.h
deleted file mode 100644
index 340bceeab9a9b..0000000000000
--- a/google/cloud/dataproc/autoscaling_policy_options.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/autoscaling_policies.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_OPTIONS_H
-
-#include "google/cloud/dataproc/autoscaling_policy_connection.h"
-#include "google/cloud/dataproc/autoscaling_policy_connection_idempotency_policy.h"
-#include "google/cloud/dataproc/v1/autoscaling_policy_options.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::AutoscalingPolicyServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::dataproc_v1::AutoscalingPolicyServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// dataproc_v1::AutoscalingPolicyServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::dataproc_v1::
-    AutoscalingPolicyServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use dataproc_v1::AutoscalingPolicyServicePolicyOptionList
-/// directly.
-using ::google::cloud::dataproc_v1::AutoscalingPolicyServicePolicyOptionList;
-
-/// @deprecated Use dataproc_v1::AutoscalingPolicyServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::dataproc_v1::AutoscalingPolicyServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_AUTOSCALING_POLICY_OPTIONS_H
diff --git a/google/cloud/dataproc/batch_controller_client.h b/google/cloud/dataproc/batch_controller_client.h
deleted file mode 100644
index e87117e47ea03..0000000000000
--- a/google/cloud/dataproc/batch_controller_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/batches.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_CLIENT_H
-
-#include "google/cloud/dataproc/batch_controller_connection.h"
-#include "google/cloud/dataproc/v1/batch_controller_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1 instead of the aliases defined in
-///     this namespace.
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::BatchControllerClient directly.
-using ::google::cloud::dataproc_v1::BatchControllerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_CLIENT_H
diff --git a/google/cloud/dataproc/batch_controller_connection.h b/google/cloud/dataproc/batch_controller_connection.h
deleted file mode 100644
index c7e1ac545cdbb..0000000000000
--- a/google/cloud/dataproc/batch_controller_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/batches.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/dataproc/batch_controller_connection_idempotency_policy.h"
-#include "google/cloud/dataproc/v1/batch_controller_connection.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::MakeBatchControllerConnection directly.
-using ::google::cloud::dataproc_v1::MakeBatchControllerConnection;
-
-/// @deprecated Use dataproc_v1::BatchControllerConnection directly.
-using ::google::cloud::dataproc_v1::BatchControllerConnection;
-
-/// @deprecated Use dataproc_v1::BatchControllerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::BatchControllerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use dataproc_v1::BatchControllerLimitedTimeRetryPolicy directly.
-using ::google::cloud::dataproc_v1::BatchControllerLimitedTimeRetryPolicy;
-
-/// @deprecated Use dataproc_v1::BatchControllerRetryPolicy directly.
-using ::google::cloud::dataproc_v1::BatchControllerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/dataproc/batch_controller_connection_idempotency_policy.h b/google/cloud/dataproc/batch_controller_connection_idempotency_policy.h
deleted file mode 100644
index 02c222cb71b5b..0000000000000
--- a/google/cloud/dataproc/batch_controller_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/batches.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/dataproc/v1/batch_controller_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// dataproc_v1::MakeDefaultBatchControllerConnectionIdempotencyPolicy directly.
-using ::google::cloud::dataproc_v1::
-    MakeDefaultBatchControllerConnectionIdempotencyPolicy;
-
-/// @deprecated Use dataproc_v1::BatchControllerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::BatchControllerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/dataproc/batch_controller_options.h b/google/cloud/dataproc/batch_controller_options.h
deleted file mode 100644
index 45903839728c4..0000000000000
--- a/google/cloud/dataproc/batch_controller_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/batches.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_OPTIONS_H
-
-#include "google/cloud/dataproc/batch_controller_connection.h"
-#include "google/cloud/dataproc/batch_controller_connection_idempotency_policy.h"
-#include "google/cloud/dataproc/v1/batch_controller_options.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::BatchControllerPollingPolicyOption directly.
-using ::google::cloud::dataproc_v1::BatchControllerPollingPolicyOption;
-
-/// @deprecated Use dataproc_v1::BatchControllerBackoffPolicyOption directly.
-using ::google::cloud::dataproc_v1::BatchControllerBackoffPolicyOption;
-
-/// @deprecated Use
-/// dataproc_v1::BatchControllerConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::dataproc_v1::
-    BatchControllerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use dataproc_v1::BatchControllerPolicyOptionList directly.
-using ::google::cloud::dataproc_v1::BatchControllerPolicyOptionList;
-
-/// @deprecated Use dataproc_v1::BatchControllerRetryPolicyOption directly.
-using ::google::cloud::dataproc_v1::BatchControllerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_BATCH_CONTROLLER_OPTIONS_H
diff --git a/google/cloud/dataproc/cluster_controller_client.h b/google/cloud/dataproc/cluster_controller_client.h
deleted file mode 100644
index 83c38621c244e..0000000000000
--- a/google/cloud/dataproc/cluster_controller_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/clusters.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_CLIENT_H
-
-#include "google/cloud/dataproc/cluster_controller_connection.h"
-#include "google/cloud/dataproc/v1/cluster_controller_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1 instead of the aliases defined in
-///     this namespace.
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::ClusterControllerClient directly.
-using ::google::cloud::dataproc_v1::ClusterControllerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_CLIENT_H
diff --git a/google/cloud/dataproc/cluster_controller_connection.h b/google/cloud/dataproc/cluster_controller_connection.h
deleted file mode 100644
index d0e87428a0741..0000000000000
--- a/google/cloud/dataproc/cluster_controller_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/clusters.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/dataproc/cluster_controller_connection_idempotency_policy.h"
-#include "google/cloud/dataproc/v1/cluster_controller_connection.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::MakeClusterControllerConnection directly.
-using ::google::cloud::dataproc_v1::MakeClusterControllerConnection;
-
-/// @deprecated Use dataproc_v1::ClusterControllerConnection directly.
-using ::google::cloud::dataproc_v1::ClusterControllerConnection;
-
-/// @deprecated Use dataproc_v1::ClusterControllerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::
-    ClusterControllerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use dataproc_v1::ClusterControllerLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::ClusterControllerLimitedTimeRetryPolicy;
-
-/// @deprecated Use dataproc_v1::ClusterControllerRetryPolicy directly.
-using ::google::cloud::dataproc_v1::ClusterControllerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/dataproc/cluster_controller_connection_idempotency_policy.h b/google/cloud/dataproc/cluster_controller_connection_idempotency_policy.h
deleted file mode 100644
index bed79b2d48f8d..0000000000000
--- a/google/cloud/dataproc/cluster_controller_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/clusters.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/dataproc/v1/cluster_controller_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// dataproc_v1::MakeDefaultClusterControllerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::
-    MakeDefaultClusterControllerConnectionIdempotencyPolicy;
-
-/// @deprecated Use dataproc_v1::ClusterControllerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::
-    ClusterControllerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/dataproc/cluster_controller_options.h b/google/cloud/dataproc/cluster_controller_options.h
deleted file mode 100644
index 8ae4dd0d332f3..0000000000000
--- a/google/cloud/dataproc/cluster_controller_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/clusters.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_OPTIONS_H
-
-#include "google/cloud/dataproc/cluster_controller_connection.h"
-#include "google/cloud/dataproc/cluster_controller_connection_idempotency_policy.h"
-#include "google/cloud/dataproc/v1/cluster_controller_options.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::ClusterControllerPollingPolicyOption directly.
-using ::google::cloud::dataproc_v1::ClusterControllerPollingPolicyOption;
-
-/// @deprecated Use dataproc_v1::ClusterControllerBackoffPolicyOption directly.
-using ::google::cloud::dataproc_v1::ClusterControllerBackoffPolicyOption;
-
-/// @deprecated Use
-/// dataproc_v1::ClusterControllerConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::dataproc_v1::
-    ClusterControllerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use dataproc_v1::ClusterControllerPolicyOptionList directly.
-using ::google::cloud::dataproc_v1::ClusterControllerPolicyOptionList;
-
-/// @deprecated Use dataproc_v1::ClusterControllerRetryPolicyOption directly.
-using ::google::cloud::dataproc_v1::ClusterControllerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_CLUSTER_CONTROLLER_OPTIONS_H
diff --git a/google/cloud/dataproc/job_controller_client.h b/google/cloud/dataproc/job_controller_client.h
deleted file mode 100644
index 0a89036c04fe4..0000000000000
--- a/google/cloud/dataproc/job_controller_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/jobs.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_CLIENT_H
-
-#include "google/cloud/dataproc/job_controller_connection.h"
-#include "google/cloud/dataproc/v1/job_controller_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1 instead of the aliases defined in
-///     this namespace.
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::JobControllerClient directly.
-using ::google::cloud::dataproc_v1::JobControllerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_CLIENT_H
diff --git a/google/cloud/dataproc/job_controller_connection.h b/google/cloud/dataproc/job_controller_connection.h
deleted file mode 100644
index a43952619b904..0000000000000
--- a/google/cloud/dataproc/job_controller_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/jobs.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/dataproc/job_controller_connection_idempotency_policy.h"
-#include "google/cloud/dataproc/v1/job_controller_connection.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::MakeJobControllerConnection directly.
-using ::google::cloud::dataproc_v1::MakeJobControllerConnection;
-
-/// @deprecated Use dataproc_v1::JobControllerConnection directly.
-using ::google::cloud::dataproc_v1::JobControllerConnection;
-
-/// @deprecated Use dataproc_v1::JobControllerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::JobControllerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use dataproc_v1::JobControllerLimitedTimeRetryPolicy directly.
-using ::google::cloud::dataproc_v1::JobControllerLimitedTimeRetryPolicy;
-
-/// @deprecated Use dataproc_v1::JobControllerRetryPolicy directly.
-using ::google::cloud::dataproc_v1::JobControllerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/dataproc/job_controller_connection_idempotency_policy.h b/google/cloud/dataproc/job_controller_connection_idempotency_policy.h
deleted file mode 100644
index 93c55dd89ba63..0000000000000
--- a/google/cloud/dataproc/job_controller_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/jobs.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/dataproc/v1/job_controller_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// dataproc_v1::MakeDefaultJobControllerConnectionIdempotencyPolicy directly.
-using ::google::cloud::dataproc_v1::
-    MakeDefaultJobControllerConnectionIdempotencyPolicy;
-
-/// @deprecated Use dataproc_v1::JobControllerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::JobControllerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/dataproc/job_controller_options.h b/google/cloud/dataproc/job_controller_options.h
deleted file mode 100644
index cc39bc908a9d4..0000000000000
--- a/google/cloud/dataproc/job_controller_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/jobs.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_OPTIONS_H
-
-#include "google/cloud/dataproc/job_controller_connection.h"
-#include "google/cloud/dataproc/job_controller_connection_idempotency_policy.h"
-#include "google/cloud/dataproc/v1/job_controller_options.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::JobControllerPollingPolicyOption directly.
-using ::google::cloud::dataproc_v1::JobControllerPollingPolicyOption;
-
-/// @deprecated Use dataproc_v1::JobControllerBackoffPolicyOption directly.
-using ::google::cloud::dataproc_v1::JobControllerBackoffPolicyOption;
-
-/// @deprecated Use dataproc_v1::JobControllerConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::dataproc_v1::
-    JobControllerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use dataproc_v1::JobControllerPolicyOptionList directly.
-using ::google::cloud::dataproc_v1::JobControllerPolicyOptionList;
-
-/// @deprecated Use dataproc_v1::JobControllerRetryPolicyOption directly.
-using ::google::cloud::dataproc_v1::JobControllerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_JOB_CONTROLLER_OPTIONS_H
diff --git a/google/cloud/dataproc/mocks/mock_autoscaling_policy_connection.h b/google/cloud/dataproc/mocks/mock_autoscaling_policy_connection.h
deleted file mode 100644
index 606b48a9bbeb5..0000000000000
--- a/google/cloud/dataproc/mocks/mock_autoscaling_policy_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/autoscaling_policies.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_AUTOSCALING_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_AUTOSCALING_POLICY_CONNECTION_H
-
-#include "google/cloud/dataproc/autoscaling_policy_connection.h"
-#include "google/cloud/dataproc/v1/mocks/mock_autoscaling_policy_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace dataproc_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1_mocks::MockAutoscalingPolicyServiceConnection
-/// directly.
-using ::google::cloud::dataproc_v1_mocks::
-    MockAutoscalingPolicyServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_AUTOSCALING_POLICY_CONNECTION_H
diff --git a/google/cloud/dataproc/mocks/mock_batch_controller_connection.h b/google/cloud/dataproc/mocks/mock_batch_controller_connection.h
deleted file mode 100644
index 2d4cfb7149e4c..0000000000000
--- a/google/cloud/dataproc/mocks/mock_batch_controller_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/batches.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_BATCH_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_BATCH_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/dataproc/batch_controller_connection.h"
-#include "google/cloud/dataproc/v1/mocks/mock_batch_controller_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace dataproc_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1_mocks::MockBatchControllerConnection directly.
-using ::google::cloud::dataproc_v1_mocks::MockBatchControllerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_BATCH_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/dataproc/mocks/mock_cluster_controller_connection.h b/google/cloud/dataproc/mocks/mock_cluster_controller_connection.h
deleted file mode 100644
index bdbb619cc9a81..0000000000000
--- a/google/cloud/dataproc/mocks/mock_cluster_controller_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/clusters.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_CLUSTER_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_CLUSTER_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/dataproc/cluster_controller_connection.h"
-#include "google/cloud/dataproc/v1/mocks/mock_cluster_controller_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace dataproc_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1_mocks::MockClusterControllerConnection directly.
-using ::google::cloud::dataproc_v1_mocks::MockClusterControllerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_CLUSTER_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/dataproc/mocks/mock_job_controller_connection.h b/google/cloud/dataproc/mocks/mock_job_controller_connection.h
deleted file mode 100644
index 34dbf77570b5f..0000000000000
--- a/google/cloud/dataproc/mocks/mock_job_controller_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/jobs.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_JOB_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_JOB_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/dataproc/job_controller_connection.h"
-#include "google/cloud/dataproc/v1/mocks/mock_job_controller_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace dataproc_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1_mocks::MockJobControllerConnection directly.
-using ::google::cloud::dataproc_v1_mocks::MockJobControllerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_JOB_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/dataproc/mocks/mock_workflow_template_connection.h b/google/cloud/dataproc/mocks/mock_workflow_template_connection.h
deleted file mode 100644
index 511c74567f417..0000000000000
--- a/google/cloud/dataproc/mocks/mock_workflow_template_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/workflow_templates.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_WORKFLOW_TEMPLATE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_WORKFLOW_TEMPLATE_CONNECTION_H
-
-#include "google/cloud/dataproc/v1/mocks/mock_workflow_template_connection.h"
-#include "google/cloud/dataproc/workflow_template_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace dataproc_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1_mocks::MockWorkflowTemplateServiceConnection
-/// directly.
-using ::google::cloud::dataproc_v1_mocks::MockWorkflowTemplateServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_MOCKS_MOCK_WORKFLOW_TEMPLATE_CONNECTION_H
diff --git a/google/cloud/dataproc/workflow_template_client.h b/google/cloud/dataproc/workflow_template_client.h
deleted file mode 100644
index b5f00a555072a..0000000000000
--- a/google/cloud/dataproc/workflow_template_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/workflow_templates.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_CLIENT_H
-
-#include "google/cloud/dataproc/v1/workflow_template_client.h"
-#include "google/cloud/dataproc/workflow_template_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dataproc_v1 instead of the aliases defined in
-///     this namespace.
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::WorkflowTemplateServiceClient directly.
-using ::google::cloud::dataproc_v1::WorkflowTemplateServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_CLIENT_H
diff --git a/google/cloud/dataproc/workflow_template_connection.h b/google/cloud/dataproc/workflow_template_connection.h
deleted file mode 100644
index 0b2f944da8bd0..0000000000000
--- a/google/cloud/dataproc/workflow_template_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/workflow_templates.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_CONNECTION_H
-
-#include "google/cloud/dataproc/v1/workflow_template_connection.h"
-#include "google/cloud/dataproc/workflow_template_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::MakeWorkflowTemplateServiceConnection directly.
-using ::google::cloud::dataproc_v1::MakeWorkflowTemplateServiceConnection;
-
-/// @deprecated Use dataproc_v1::WorkflowTemplateServiceConnection directly.
-using ::google::cloud::dataproc_v1::WorkflowTemplateServiceConnection;
-
-/// @deprecated Use
-/// dataproc_v1::WorkflowTemplateServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::dataproc_v1::
-    WorkflowTemplateServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use dataproc_v1::WorkflowTemplateServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::
-    WorkflowTemplateServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use dataproc_v1::WorkflowTemplateServiceRetryPolicy directly.
-using ::google::cloud::dataproc_v1::WorkflowTemplateServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_CONNECTION_H
diff --git a/google/cloud/dataproc/workflow_template_connection_idempotency_policy.h b/google/cloud/dataproc/workflow_template_connection_idempotency_policy.h
deleted file mode 100644
index 9eba029026560..0000000000000
--- a/google/cloud/dataproc/workflow_template_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/workflow_templates.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/dataproc/v1/workflow_template_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// dataproc_v1::MakeDefaultWorkflowTemplateServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dataproc_v1::
-    MakeDefaultWorkflowTemplateServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// dataproc_v1::WorkflowTemplateServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::dataproc_v1::
-    WorkflowTemplateServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/dataproc/workflow_template_options.h b/google/cloud/dataproc/workflow_template_options.h
deleted file mode 100644
index 551f29c9c8167..0000000000000
--- a/google/cloud/dataproc/workflow_template_options.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/dataproc/v1/workflow_templates.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_OPTIONS_H
-
-#include "google/cloud/dataproc/v1/workflow_template_options.h"
-#include "google/cloud/dataproc/workflow_template_connection.h"
-#include "google/cloud/dataproc/workflow_template_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dataproc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dataproc_v1::WorkflowTemplateServicePollingPolicyOption
-/// directly.
-using ::google::cloud::dataproc_v1::WorkflowTemplateServicePollingPolicyOption;
-
-/// @deprecated Use dataproc_v1::WorkflowTemplateServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::dataproc_v1::WorkflowTemplateServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// dataproc_v1::WorkflowTemplateServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::dataproc_v1::
-    WorkflowTemplateServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use dataproc_v1::WorkflowTemplateServicePolicyOptionList
-/// directly.
-using ::google::cloud::dataproc_v1::WorkflowTemplateServicePolicyOptionList;
-
-/// @deprecated Use dataproc_v1::WorkflowTemplateServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::dataproc_v1::WorkflowTemplateServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dataproc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATAPROC_WORKFLOW_TEMPLATE_OPTIONS_H
diff --git a/google/cloud/datastream/BUILD.bazel b/google/cloud/datastream/BUILD.bazel
index 1c50fd4fd6c4e..f41c27dcf4992 100644
--- a/google/cloud/datastream/BUILD.bazel
+++ b/google/cloud/datastream/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/datastream/CMakeLists.txt b/google/cloud/datastream/CMakeLists.txt
index 7d1f1647a60d6..e59ba3ab14e63 100644
--- a/google/cloud/datastream/CMakeLists.txt
+++ b/google/cloud/datastream/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(datastream "Datastream API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(datastream_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/datastream/datastream_client.h b/google/cloud/datastream/datastream_client.h
deleted file mode 100644
index 05a31759875aa..0000000000000
--- a/google/cloud/datastream/datastream_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datastream/v1/datastream.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_CLIENT_H
-
-#include "google/cloud/datastream/datastream_connection.h"
-#include "google/cloud/datastream/v1/datastream_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datastream_v1 instead of the aliases defined in
-///     this namespace.
-namespace datastream {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datastream_v1::DatastreamClient directly.
-using ::google::cloud::datastream_v1::DatastreamClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datastream
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_CLIENT_H
diff --git a/google/cloud/datastream/datastream_connection.h b/google/cloud/datastream/datastream_connection.h
deleted file mode 100644
index dd0f934ecb2d6..0000000000000
--- a/google/cloud/datastream/datastream_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datastream/v1/datastream.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_CONNECTION_H
-
-#include "google/cloud/datastream/datastream_connection_idempotency_policy.h"
-#include "google/cloud/datastream/v1/datastream_connection.h"
-
-namespace google {
-namespace cloud {
-namespace datastream {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datastream_v1::MakeDatastreamConnection directly.
-using ::google::cloud::datastream_v1::MakeDatastreamConnection;
-
-/// @deprecated Use datastream_v1::DatastreamConnection directly.
-using ::google::cloud::datastream_v1::DatastreamConnection;
-
-/// @deprecated Use datastream_v1::DatastreamLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::datastream_v1::DatastreamLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use datastream_v1::DatastreamLimitedTimeRetryPolicy directly.
-using ::google::cloud::datastream_v1::DatastreamLimitedTimeRetryPolicy;
-
-/// @deprecated Use datastream_v1::DatastreamRetryPolicy directly.
-using ::google::cloud::datastream_v1::DatastreamRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datastream
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_CONNECTION_H
diff --git a/google/cloud/datastream/datastream_connection_idempotency_policy.h b/google/cloud/datastream/datastream_connection_idempotency_policy.h
deleted file mode 100644
index d64567b1c1d4f..0000000000000
--- a/google/cloud/datastream/datastream_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datastream/v1/datastream.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/datastream/v1/datastream_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace datastream {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// datastream_v1::MakeDefaultDatastreamConnectionIdempotencyPolicy directly.
-using ::google::cloud::datastream_v1::
-    MakeDefaultDatastreamConnectionIdempotencyPolicy;
-
-/// @deprecated Use datastream_v1::DatastreamConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::datastream_v1::DatastreamConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datastream
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/datastream/datastream_options.h b/google/cloud/datastream/datastream_options.h
deleted file mode 100644
index 51ddcafce2463..0000000000000
--- a/google/cloud/datastream/datastream_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datastream/v1/datastream.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_OPTIONS_H
-
-#include "google/cloud/datastream/datastream_connection.h"
-#include "google/cloud/datastream/datastream_connection_idempotency_policy.h"
-#include "google/cloud/datastream/v1/datastream_options.h"
-
-namespace google {
-namespace cloud {
-namespace datastream {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datastream_v1::DatastreamPollingPolicyOption directly.
-using ::google::cloud::datastream_v1::DatastreamPollingPolicyOption;
-
-/// @deprecated Use datastream_v1::DatastreamBackoffPolicyOption directly.
-using ::google::cloud::datastream_v1::DatastreamBackoffPolicyOption;
-
-/// @deprecated Use datastream_v1::DatastreamConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::datastream_v1::
-    DatastreamConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use datastream_v1::DatastreamPolicyOptionList directly.
-using ::google::cloud::datastream_v1::DatastreamPolicyOptionList;
-
-/// @deprecated Use datastream_v1::DatastreamRetryPolicyOption directly.
-using ::google::cloud::datastream_v1::DatastreamRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datastream
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_DATASTREAM_OPTIONS_H
diff --git a/google/cloud/datastream/mocks/mock_datastream_connection.h b/google/cloud/datastream/mocks/mock_datastream_connection.h
deleted file mode 100644
index 31451dc76b8e1..0000000000000
--- a/google/cloud/datastream/mocks/mock_datastream_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/datastream/v1/datastream.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_MOCKS_MOCK_DATASTREAM_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_MOCKS_MOCK_DATASTREAM_CONNECTION_H
-
-#include "google/cloud/datastream/datastream_connection.h"
-#include "google/cloud/datastream/v1/mocks/mock_datastream_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in datastream_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace datastream_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use datastream_v1_mocks::MockDatastreamConnection directly.
-using ::google::cloud::datastream_v1_mocks::MockDatastreamConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace datastream_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DATASTREAM_MOCKS_MOCK_DATASTREAM_CONNECTION_H
diff --git a/google/cloud/deploy/BUILD.bazel b/google/cloud/deploy/BUILD.bazel
index 0dd760a4d8aa7..48b8fee93430a 100644
--- a/google/cloud/deploy/BUILD.bazel
+++ b/google/cloud/deploy/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/deploy/CMakeLists.txt b/google/cloud/deploy/CMakeLists.txt
index 54b8843ba6edb..aca4ff1c43874 100644
--- a/google/cloud/deploy/CMakeLists.txt
+++ b/google/cloud/deploy/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(deploy "Google Cloud Deploy API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(deploy_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/deploy/cloud_deploy_client.h b/google/cloud/deploy/cloud_deploy_client.h
deleted file mode 100644
index 22f428899a9a0..0000000000000
--- a/google/cloud/deploy/cloud_deploy_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/deploy/v1/cloud_deploy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_CLIENT_H
-
-#include "google/cloud/deploy/cloud_deploy_connection.h"
-#include "google/cloud/deploy/v1/cloud_deploy_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in deploy_v1 instead of the aliases defined in
-///     this namespace.
-namespace deploy {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use deploy_v1::CloudDeployClient directly.
-using ::google::cloud::deploy_v1::CloudDeployClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace deploy
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_CLIENT_H
diff --git a/google/cloud/deploy/cloud_deploy_connection.h b/google/cloud/deploy/cloud_deploy_connection.h
deleted file mode 100644
index 07ac72b2d7c99..0000000000000
--- a/google/cloud/deploy/cloud_deploy_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/deploy/v1/cloud_deploy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_CONNECTION_H
-
-#include "google/cloud/deploy/cloud_deploy_connection_idempotency_policy.h"
-#include "google/cloud/deploy/v1/cloud_deploy_connection.h"
-
-namespace google {
-namespace cloud {
-namespace deploy {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use deploy_v1::MakeCloudDeployConnection directly.
-using ::google::cloud::deploy_v1::MakeCloudDeployConnection;
-
-/// @deprecated Use deploy_v1::CloudDeployConnection directly.
-using ::google::cloud::deploy_v1::CloudDeployConnection;
-
-/// @deprecated Use deploy_v1::CloudDeployLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::deploy_v1::CloudDeployLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use deploy_v1::CloudDeployLimitedTimeRetryPolicy directly.
-using ::google::cloud::deploy_v1::CloudDeployLimitedTimeRetryPolicy;
-
-/// @deprecated Use deploy_v1::CloudDeployRetryPolicy directly.
-using ::google::cloud::deploy_v1::CloudDeployRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace deploy
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_CONNECTION_H
diff --git a/google/cloud/deploy/cloud_deploy_connection_idempotency_policy.h b/google/cloud/deploy/cloud_deploy_connection_idempotency_policy.h
deleted file mode 100644
index b3dc187055cdc..0000000000000
--- a/google/cloud/deploy/cloud_deploy_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/deploy/v1/cloud_deploy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/deploy/v1/cloud_deploy_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace deploy {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use deploy_v1::MakeDefaultCloudDeployConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::deploy_v1::
-    MakeDefaultCloudDeployConnectionIdempotencyPolicy;
-
-/// @deprecated Use deploy_v1::CloudDeployConnectionIdempotencyPolicy directly.
-using ::google::cloud::deploy_v1::CloudDeployConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace deploy
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/deploy/cloud_deploy_options.h b/google/cloud/deploy/cloud_deploy_options.h
deleted file mode 100644
index d63ae04a36d4e..0000000000000
--- a/google/cloud/deploy/cloud_deploy_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/deploy/v1/cloud_deploy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_OPTIONS_H
-
-#include "google/cloud/deploy/cloud_deploy_connection.h"
-#include "google/cloud/deploy/cloud_deploy_connection_idempotency_policy.h"
-#include "google/cloud/deploy/v1/cloud_deploy_options.h"
-
-namespace google {
-namespace cloud {
-namespace deploy {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use deploy_v1::CloudDeployPollingPolicyOption directly.
-using ::google::cloud::deploy_v1::CloudDeployPollingPolicyOption;
-
-/// @deprecated Use deploy_v1::CloudDeployBackoffPolicyOption directly.
-using ::google::cloud::deploy_v1::CloudDeployBackoffPolicyOption;
-
-/// @deprecated Use deploy_v1::CloudDeployConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::deploy_v1::CloudDeployConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use deploy_v1::CloudDeployPolicyOptionList directly.
-using ::google::cloud::deploy_v1::CloudDeployPolicyOptionList;
-
-/// @deprecated Use deploy_v1::CloudDeployRetryPolicyOption directly.
-using ::google::cloud::deploy_v1::CloudDeployRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace deploy
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_CLOUD_DEPLOY_OPTIONS_H
diff --git a/google/cloud/deploy/mocks/mock_cloud_deploy_connection.h b/google/cloud/deploy/mocks/mock_cloud_deploy_connection.h
deleted file mode 100644
index 3365dbcd64b1c..0000000000000
--- a/google/cloud/deploy/mocks/mock_cloud_deploy_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/deploy/v1/cloud_deploy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_MOCKS_MOCK_CLOUD_DEPLOY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_MOCKS_MOCK_CLOUD_DEPLOY_CONNECTION_H
-
-#include "google/cloud/deploy/cloud_deploy_connection.h"
-#include "google/cloud/deploy/v1/mocks/mock_cloud_deploy_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in deploy_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace deploy_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use deploy_v1_mocks::MockCloudDeployConnection directly.
-using ::google::cloud::deploy_v1_mocks::MockCloudDeployConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace deploy_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DEPLOY_MOCKS_MOCK_CLOUD_DEPLOY_CONNECTION_H
diff --git a/google/cloud/dlp/BUILD.bazel b/google/cloud/dlp/BUILD.bazel
index 54d83d4a53fc0..8d5b3cbbca474 100644
--- a/google/cloud/dlp/BUILD.bazel
+++ b/google/cloud/dlp/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v2/",
 ]
 
diff --git a/google/cloud/dlp/CMakeLists.txt b/google/cloud/dlp/CMakeLists.txt
index 14c3dcf46b4b0..86ee7955928ce 100644
--- a/google/cloud/dlp/CMakeLists.txt
+++ b/google/cloud/dlp/CMakeLists.txt
@@ -27,7 +27,7 @@ endif ()
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(dlp "Cloud Data Loss Prevention (DLP) API"
-                                   SERVICE_DIRS "__EMPTY__" "v2/")
+                                   SERVICE_DIRS "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(dlp_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/dlp/dlp_client.h b/google/cloud/dlp/dlp_client.h
deleted file mode 100644
index db3ad018391e1..0000000000000
--- a/google/cloud/dlp/dlp_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/privacy/dlp/v2/dlp.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_CLIENT_H
-
-#include "google/cloud/dlp/dlp_connection.h"
-#include "google/cloud/dlp/v2/dlp_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dlp_v2 instead of the aliases defined in
-///     this namespace.
-namespace dlp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dlp_v2::DlpServiceClient directly.
-using ::google::cloud::dlp_v2::DlpServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dlp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_CLIENT_H
diff --git a/google/cloud/dlp/dlp_connection.h b/google/cloud/dlp/dlp_connection.h
deleted file mode 100644
index 770d6ea21e895..0000000000000
--- a/google/cloud/dlp/dlp_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/privacy/dlp/v2/dlp.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_CONNECTION_H
-
-#include "google/cloud/dlp/dlp_connection_idempotency_policy.h"
-#include "google/cloud/dlp/v2/dlp_connection.h"
-
-namespace google {
-namespace cloud {
-namespace dlp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dlp_v2::MakeDlpServiceConnection directly.
-using ::google::cloud::dlp_v2::MakeDlpServiceConnection;
-
-/// @deprecated Use dlp_v2::DlpServiceConnection directly.
-using ::google::cloud::dlp_v2::DlpServiceConnection;
-
-/// @deprecated Use dlp_v2::DlpServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::dlp_v2::DlpServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use dlp_v2::DlpServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::dlp_v2::DlpServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use dlp_v2::DlpServiceRetryPolicy directly.
-using ::google::cloud::dlp_v2::DlpServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dlp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_CONNECTION_H
diff --git a/google/cloud/dlp/dlp_connection_idempotency_policy.h b/google/cloud/dlp/dlp_connection_idempotency_policy.h
deleted file mode 100644
index 27fd24fe34b9e..0000000000000
--- a/google/cloud/dlp/dlp_connection_idempotency_policy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/privacy/dlp/v2/dlp.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/dlp/v2/dlp_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace dlp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dlp_v2::MakeDefaultDlpServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::dlp_v2::MakeDefaultDlpServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use dlp_v2::DlpServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::dlp_v2::DlpServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dlp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/dlp/dlp_options.h b/google/cloud/dlp/dlp_options.h
deleted file mode 100644
index 349e32c5ba3b7..0000000000000
--- a/google/cloud/dlp/dlp_options.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/privacy/dlp/v2/dlp.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_OPTIONS_H
-
-#include "google/cloud/dlp/dlp_connection.h"
-#include "google/cloud/dlp/dlp_connection_idempotency_policy.h"
-#include "google/cloud/dlp/v2/dlp_options.h"
-
-namespace google {
-namespace cloud {
-namespace dlp {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dlp_v2::DlpServiceBackoffPolicyOption directly.
-using ::google::cloud::dlp_v2::DlpServiceBackoffPolicyOption;
-
-/// @deprecated Use dlp_v2::DlpServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::dlp_v2::DlpServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use dlp_v2::DlpServicePolicyOptionList directly.
-using ::google::cloud::dlp_v2::DlpServicePolicyOptionList;
-
-/// @deprecated Use dlp_v2::DlpServiceRetryPolicyOption directly.
-using ::google::cloud::dlp_v2::DlpServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dlp
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_DLP_OPTIONS_H
diff --git a/google/cloud/dlp/mocks/mock_dlp_connection.h b/google/cloud/dlp/mocks/mock_dlp_connection.h
deleted file mode 100644
index fee457d1c4851..0000000000000
--- a/google/cloud/dlp/mocks/mock_dlp_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/privacy/dlp/v2/dlp.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_MOCKS_MOCK_DLP_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_MOCKS_MOCK_DLP_CONNECTION_H
-
-#include "google/cloud/dlp/dlp_connection.h"
-#include "google/cloud/dlp/v2/mocks/mock_dlp_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in dlp_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace dlp_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use dlp_v2_mocks::MockDlpServiceConnection directly.
-using ::google::cloud::dlp_v2_mocks::MockDlpServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace dlp_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DLP_MOCKS_MOCK_DLP_CONNECTION_H
diff --git a/google/cloud/documentai/BUILD.bazel b/google/cloud/documentai/BUILD.bazel
index 83abd73c05599..4201e94aae79f 100644
--- a/google/cloud/documentai/BUILD.bazel
+++ b/google/cloud/documentai/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/documentai/CMakeLists.txt b/google/cloud/documentai/CMakeLists.txt
index 445b94c30a9a6..2c2cd950edea3 100644
--- a/google/cloud/documentai/CMakeLists.txt
+++ b/google/cloud/documentai/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(documentai "Cloud Document AI API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(documentai_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/documentai/document_processor_client.h b/google/cloud/documentai/document_processor_client.h
deleted file mode 100644
index 4f4bc078cb5c1..0000000000000
--- a/google/cloud/documentai/document_processor_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/documentai/v1/document_processor_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_CLIENT_H
-
-#include "google/cloud/documentai/document_processor_connection.h"
-#include "google/cloud/documentai/v1/document_processor_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in documentai_v1 instead of the aliases defined in
-///     this namespace.
-namespace documentai {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use documentai_v1::DocumentProcessorServiceClient directly.
-using ::google::cloud::documentai_v1::DocumentProcessorServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace documentai
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_CLIENT_H
diff --git a/google/cloud/documentai/document_processor_connection.h b/google/cloud/documentai/document_processor_connection.h
deleted file mode 100644
index 11f9069d037d4..0000000000000
--- a/google/cloud/documentai/document_processor_connection.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/documentai/v1/document_processor_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_CONNECTION_H
-
-#include "google/cloud/documentai/document_processor_connection_idempotency_policy.h"
-#include "google/cloud/documentai/v1/document_processor_connection.h"
-
-namespace google {
-namespace cloud {
-namespace documentai {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use documentai_v1::MakeDocumentProcessorServiceConnection
-/// directly.
-using ::google::cloud::documentai_v1::MakeDocumentProcessorServiceConnection;
-
-/// @deprecated Use documentai_v1::DocumentProcessorServiceConnection directly.
-using ::google::cloud::documentai_v1::DocumentProcessorServiceConnection;
-
-/// @deprecated Use
-/// documentai_v1::DocumentProcessorServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::documentai_v1::
-    DocumentProcessorServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// documentai_v1::DocumentProcessorServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::documentai_v1::
-    DocumentProcessorServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use documentai_v1::DocumentProcessorServiceRetryPolicy directly.
-using ::google::cloud::documentai_v1::DocumentProcessorServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace documentai
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_CONNECTION_H
diff --git a/google/cloud/documentai/document_processor_connection_idempotency_policy.h b/google/cloud/documentai/document_processor_connection_idempotency_policy.h
deleted file mode 100644
index 80f0a5b3940ab..0000000000000
--- a/google/cloud/documentai/document_processor_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/documentai/v1/document_processor_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/documentai/v1/document_processor_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace documentai {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// documentai_v1::MakeDefaultDocumentProcessorServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::documentai_v1::
-    MakeDefaultDocumentProcessorServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// documentai_v1::DocumentProcessorServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::documentai_v1::
-    DocumentProcessorServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace documentai
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/documentai/document_processor_options.h b/google/cloud/documentai/document_processor_options.h
deleted file mode 100644
index 8b9ac2825a251..0000000000000
--- a/google/cloud/documentai/document_processor_options.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/documentai/v1/document_processor_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_OPTIONS_H
-
-#include "google/cloud/documentai/document_processor_connection.h"
-#include "google/cloud/documentai/document_processor_connection_idempotency_policy.h"
-#include "google/cloud/documentai/v1/document_processor_options.h"
-
-namespace google {
-namespace cloud {
-namespace documentai {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use documentai_v1::DocumentProcessorServicePollingPolicyOption
-/// directly.
-using ::google::cloud::documentai_v1::
-    DocumentProcessorServicePollingPolicyOption;
-
-/// @deprecated Use documentai_v1::DocumentProcessorServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::documentai_v1::
-    DocumentProcessorServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// documentai_v1::DocumentProcessorServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::documentai_v1::
-    DocumentProcessorServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use documentai_v1::DocumentProcessorServicePolicyOptionList
-/// directly.
-using ::google::cloud::documentai_v1::DocumentProcessorServicePolicyOptionList;
-
-/// @deprecated Use documentai_v1::DocumentProcessorServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::documentai_v1::DocumentProcessorServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace documentai
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_DOCUMENT_PROCESSOR_OPTIONS_H
diff --git a/google/cloud/documentai/mocks/mock_document_processor_connection.h b/google/cloud/documentai/mocks/mock_document_processor_connection.h
deleted file mode 100644
index 012da8fd15fae..0000000000000
--- a/google/cloud/documentai/mocks/mock_document_processor_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/documentai/v1/document_processor_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_MOCKS_MOCK_DOCUMENT_PROCESSOR_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_MOCKS_MOCK_DOCUMENT_PROCESSOR_CONNECTION_H
-
-#include "google/cloud/documentai/document_processor_connection.h"
-#include "google/cloud/documentai/v1/mocks/mock_document_processor_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in documentai_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace documentai_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use documentai_v1_mocks::MockDocumentProcessorServiceConnection
-/// directly.
-using ::google::cloud::documentai_v1_mocks::
-    MockDocumentProcessorServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace documentai_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_DOCUMENTAI_MOCKS_MOCK_DOCUMENT_PROCESSOR_CONNECTION_H
diff --git a/google/cloud/edgecontainer/BUILD.bazel b/google/cloud/edgecontainer/BUILD.bazel
index a6bfde8530c4d..513ce4136443b 100644
--- a/google/cloud/edgecontainer/BUILD.bazel
+++ b/google/cloud/edgecontainer/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/edgecontainer/CMakeLists.txt b/google/cloud/edgecontainer/CMakeLists.txt
index 4dfc9ffa12273..1d46458ae47fa 100644
--- a/google/cloud/edgecontainer/CMakeLists.txt
+++ b/google/cloud/edgecontainer/CMakeLists.txt
@@ -17,8 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
-    edgecontainer "Distributed Cloud Edge Container API"
-    SERVICE_DIRS "__EMPTY__" "v1/")
+    edgecontainer "Distributed Cloud Edge Container API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(edgecontainer_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/edgecontainer/edge_container_client.h b/google/cloud/edgecontainer/edge_container_client.h
deleted file mode 100644
index d026eb46bfe13..0000000000000
--- a/google/cloud/edgecontainer/edge_container_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/edgecontainer/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_CLIENT_H
-
-#include "google/cloud/edgecontainer/edge_container_connection.h"
-#include "google/cloud/edgecontainer/v1/edge_container_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in edgecontainer_v1 instead of the aliases defined in
-///     this namespace.
-namespace edgecontainer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerClient directly.
-using ::google::cloud::edgecontainer_v1::EdgeContainerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace edgecontainer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_CLIENT_H
diff --git a/google/cloud/edgecontainer/edge_container_connection.h b/google/cloud/edgecontainer/edge_container_connection.h
deleted file mode 100644
index 002afd66bfca1..0000000000000
--- a/google/cloud/edgecontainer/edge_container_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/edgecontainer/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_CONNECTION_H
-
-#include "google/cloud/edgecontainer/edge_container_connection_idempotency_policy.h"
-#include "google/cloud/edgecontainer/v1/edge_container_connection.h"
-
-namespace google {
-namespace cloud {
-namespace edgecontainer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use edgecontainer_v1::MakeEdgeContainerConnection directly.
-using ::google::cloud::edgecontainer_v1::MakeEdgeContainerConnection;
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerConnection directly.
-using ::google::cloud::edgecontainer_v1::EdgeContainerConnection;
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::edgecontainer_v1::
-    EdgeContainerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::edgecontainer_v1::EdgeContainerLimitedTimeRetryPolicy;
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerRetryPolicy directly.
-using ::google::cloud::edgecontainer_v1::EdgeContainerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace edgecontainer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_CONNECTION_H
diff --git a/google/cloud/edgecontainer/edge_container_connection_idempotency_policy.h b/google/cloud/edgecontainer/edge_container_connection_idempotency_policy.h
deleted file mode 100644
index 77fac618d73a2..0000000000000
--- a/google/cloud/edgecontainer/edge_container_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/edgecontainer/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/edgecontainer/v1/edge_container_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace edgecontainer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// edgecontainer_v1::MakeDefaultEdgeContainerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::edgecontainer_v1::
-    MakeDefaultEdgeContainerConnectionIdempotencyPolicy;
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::edgecontainer_v1::
-    EdgeContainerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace edgecontainer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/edgecontainer/edge_container_options.h b/google/cloud/edgecontainer/edge_container_options.h
deleted file mode 100644
index 3c09eae2f5089..0000000000000
--- a/google/cloud/edgecontainer/edge_container_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/edgecontainer/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_OPTIONS_H
-
-#include "google/cloud/edgecontainer/edge_container_connection.h"
-#include "google/cloud/edgecontainer/edge_container_connection_idempotency_policy.h"
-#include "google/cloud/edgecontainer/v1/edge_container_options.h"
-
-namespace google {
-namespace cloud {
-namespace edgecontainer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerPollingPolicyOption directly.
-using ::google::cloud::edgecontainer_v1::EdgeContainerPollingPolicyOption;
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerBackoffPolicyOption directly.
-using ::google::cloud::edgecontainer_v1::EdgeContainerBackoffPolicyOption;
-
-/// @deprecated Use
-/// edgecontainer_v1::EdgeContainerConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::edgecontainer_v1::
-    EdgeContainerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerPolicyOptionList directly.
-using ::google::cloud::edgecontainer_v1::EdgeContainerPolicyOptionList;
-
-/// @deprecated Use edgecontainer_v1::EdgeContainerRetryPolicyOption directly.
-using ::google::cloud::edgecontainer_v1::EdgeContainerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace edgecontainer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_EDGE_CONTAINER_OPTIONS_H
diff --git a/google/cloud/edgecontainer/mocks/mock_edge_container_connection.h b/google/cloud/edgecontainer/mocks/mock_edge_container_connection.h
deleted file mode 100644
index 0b909b6410b58..0000000000000
--- a/google/cloud/edgecontainer/mocks/mock_edge_container_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/edgecontainer/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_MOCKS_MOCK_EDGE_CONTAINER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_MOCKS_MOCK_EDGE_CONTAINER_CONNECTION_H
-
-#include "google/cloud/edgecontainer/edge_container_connection.h"
-#include "google/cloud/edgecontainer/v1/mocks/mock_edge_container_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in edgecontainer_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace edgecontainer_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use edgecontainer_v1_mocks::MockEdgeContainerConnection
-/// directly.
-using ::google::cloud::edgecontainer_v1_mocks::MockEdgeContainerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace edgecontainer_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGECONTAINER_MOCKS_MOCK_EDGE_CONTAINER_CONNECTION_H
diff --git a/google/cloud/eventarc/BUILD.bazel b/google/cloud/eventarc/BUILD.bazel
index 78036769bf2e8..8f372ffbfbdf9 100644
--- a/google/cloud/eventarc/BUILD.bazel
+++ b/google/cloud/eventarc/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "publishing/v1/",
     "v1/",
 ]
diff --git a/google/cloud/eventarc/CMakeLists.txt b/google/cloud/eventarc/CMakeLists.txt
index 65b1f628c842f..fc7def70c0de4 100644
--- a/google/cloud/eventarc/CMakeLists.txt
+++ b/google/cloud/eventarc/CMakeLists.txt
@@ -16,8 +16,8 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(
-    eventarc "Eventarc API" SERVICE_DIRS "__EMPTY__" "publishing/v1/" "v1/")
+google_cloud_cpp_add_gapic_library(eventarc "Eventarc API"
+                                   SERVICE_DIRS "publishing/v1/" "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(eventarc_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/eventarc/eventarc_client.h b/google/cloud/eventarc/eventarc_client.h
deleted file mode 100644
index d2c70fd4f8acf..0000000000000
--- a/google/cloud/eventarc/eventarc_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/v1/eventarc.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_CLIENT_H
-
-#include "google/cloud/eventarc/eventarc_connection.h"
-#include "google/cloud/eventarc/v1/eventarc_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in eventarc_v1 instead of the aliases defined in
-///     this namespace.
-namespace eventarc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use eventarc_v1::EventarcClient directly.
-using ::google::cloud::eventarc_v1::EventarcClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_CLIENT_H
diff --git a/google/cloud/eventarc/eventarc_connection.h b/google/cloud/eventarc/eventarc_connection.h
deleted file mode 100644
index 49529ce2e4ac6..0000000000000
--- a/google/cloud/eventarc/eventarc_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/v1/eventarc.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_CONNECTION_H
-
-#include "google/cloud/eventarc/eventarc_connection_idempotency_policy.h"
-#include "google/cloud/eventarc/v1/eventarc_connection.h"
-
-namespace google {
-namespace cloud {
-namespace eventarc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use eventarc_v1::MakeEventarcConnection directly.
-using ::google::cloud::eventarc_v1::MakeEventarcConnection;
-
-/// @deprecated Use eventarc_v1::EventarcConnection directly.
-using ::google::cloud::eventarc_v1::EventarcConnection;
-
-/// @deprecated Use eventarc_v1::EventarcLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::eventarc_v1::EventarcLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use eventarc_v1::EventarcLimitedTimeRetryPolicy directly.
-using ::google::cloud::eventarc_v1::EventarcLimitedTimeRetryPolicy;
-
-/// @deprecated Use eventarc_v1::EventarcRetryPolicy directly.
-using ::google::cloud::eventarc_v1::EventarcRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_CONNECTION_H
diff --git a/google/cloud/eventarc/eventarc_connection_idempotency_policy.h b/google/cloud/eventarc/eventarc_connection_idempotency_policy.h
deleted file mode 100644
index 1b4965d213d1c..0000000000000
--- a/google/cloud/eventarc/eventarc_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/v1/eventarc.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/eventarc/v1/eventarc_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace eventarc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use eventarc_v1::MakeDefaultEventarcConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::eventarc_v1::
-    MakeDefaultEventarcConnectionIdempotencyPolicy;
-
-/// @deprecated Use eventarc_v1::EventarcConnectionIdempotencyPolicy directly.
-using ::google::cloud::eventarc_v1::EventarcConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/eventarc/eventarc_options.h b/google/cloud/eventarc/eventarc_options.h
deleted file mode 100644
index 6c0360bcb57b8..0000000000000
--- a/google/cloud/eventarc/eventarc_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/v1/eventarc.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_OPTIONS_H
-
-#include "google/cloud/eventarc/eventarc_connection.h"
-#include "google/cloud/eventarc/eventarc_connection_idempotency_policy.h"
-#include "google/cloud/eventarc/v1/eventarc_options.h"
-
-namespace google {
-namespace cloud {
-namespace eventarc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use eventarc_v1::EventarcPollingPolicyOption directly.
-using ::google::cloud::eventarc_v1::EventarcPollingPolicyOption;
-
-/// @deprecated Use eventarc_v1::EventarcBackoffPolicyOption directly.
-using ::google::cloud::eventarc_v1::EventarcBackoffPolicyOption;
-
-/// @deprecated Use eventarc_v1::EventarcConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::eventarc_v1::EventarcConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use eventarc_v1::EventarcPolicyOptionList directly.
-using ::google::cloud::eventarc_v1::EventarcPolicyOptionList;
-
-/// @deprecated Use eventarc_v1::EventarcRetryPolicyOption directly.
-using ::google::cloud::eventarc_v1::EventarcRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_EVENTARC_OPTIONS_H
diff --git a/google/cloud/eventarc/mocks/mock_eventarc_connection.h b/google/cloud/eventarc/mocks/mock_eventarc_connection.h
deleted file mode 100644
index ab9ec3d702a12..0000000000000
--- a/google/cloud/eventarc/mocks/mock_eventarc_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/v1/eventarc.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_MOCKS_MOCK_EVENTARC_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_MOCKS_MOCK_EVENTARC_CONNECTION_H
-
-#include "google/cloud/eventarc/eventarc_connection.h"
-#include "google/cloud/eventarc/v1/mocks/mock_eventarc_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in eventarc_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace eventarc_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use eventarc_v1_mocks::MockEventarcConnection directly.
-using ::google::cloud::eventarc_v1_mocks::MockEventarcConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_MOCKS_MOCK_EVENTARC_CONNECTION_H
diff --git a/google/cloud/eventarc/mocks/mock_publisher_connection.h b/google/cloud/eventarc/mocks/mock_publisher_connection.h
deleted file mode 100644
index 692235ccd2b99..0000000000000
--- a/google/cloud/eventarc/mocks/mock_publisher_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/publishing/v1/publisher.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_MOCKS_MOCK_PUBLISHER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_MOCKS_MOCK_PUBLISHER_CONNECTION_H
-
-#include "google/cloud/eventarc/publisher_connection.h"
-#include "google/cloud/eventarc/publishing/v1/mocks/mock_publisher_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in eventarc_publishing_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace eventarc_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use eventarc_publishing_v1_mocks::MockPublisherConnection
-/// directly.
-using ::google::cloud::eventarc_publishing_v1_mocks::MockPublisherConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_MOCKS_MOCK_PUBLISHER_CONNECTION_H
diff --git a/google/cloud/eventarc/publisher_client.h b/google/cloud/eventarc/publisher_client.h
deleted file mode 100644
index 1e209fb951f89..0000000000000
--- a/google/cloud/eventarc/publisher_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/publishing/v1/publisher.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_CLIENT_H
-
-#include "google/cloud/eventarc/publisher_connection.h"
-#include "google/cloud/eventarc/publishing/v1/publisher_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in eventarc_publishing_v1 instead of the aliases defined
-///     in this namespace.
-namespace eventarc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use eventarc_publishing_v1::PublisherClient directly.
-using ::google::cloud::eventarc_publishing_v1::PublisherClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_CLIENT_H
diff --git a/google/cloud/eventarc/publisher_connection.h b/google/cloud/eventarc/publisher_connection.h
deleted file mode 100644
index 9b5a6a49e882a..0000000000000
--- a/google/cloud/eventarc/publisher_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/publishing/v1/publisher.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_CONNECTION_H
-
-#include "google/cloud/eventarc/publisher_connection_idempotency_policy.h"
-#include "google/cloud/eventarc/publishing/v1/publisher_connection.h"
-
-namespace google {
-namespace cloud {
-namespace eventarc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use eventarc_publishing_v1::MakePublisherConnection directly.
-using ::google::cloud::eventarc_publishing_v1::MakePublisherConnection;
-
-/// @deprecated Use eventarc_publishing_v1::PublisherConnection directly.
-using ::google::cloud::eventarc_publishing_v1::PublisherConnection;
-
-/// @deprecated Use
-/// eventarc_publishing_v1::PublisherLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::eventarc_publishing_v1::
-    PublisherLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use eventarc_publishing_v1::PublisherLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::eventarc_publishing_v1::PublisherLimitedTimeRetryPolicy;
-
-/// @deprecated Use eventarc_publishing_v1::PublisherRetryPolicy directly.
-using ::google::cloud::eventarc_publishing_v1::PublisherRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_CONNECTION_H
diff --git a/google/cloud/eventarc/publisher_connection_idempotency_policy.h b/google/cloud/eventarc/publisher_connection_idempotency_policy.h
deleted file mode 100644
index d17e0f928b59e..0000000000000
--- a/google/cloud/eventarc/publisher_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/publishing/v1/publisher.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/eventarc/publishing/v1/publisher_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace eventarc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// eventarc_publishing_v1::MakeDefaultPublisherConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::eventarc_publishing_v1::
-    MakeDefaultPublisherConnectionIdempotencyPolicy;
-
-/// @deprecated Use eventarc_publishing_v1::PublisherConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::eventarc_publishing_v1::
-    PublisherConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/eventarc/publisher_options.h b/google/cloud/eventarc/publisher_options.h
deleted file mode 100644
index 9030867f851b9..0000000000000
--- a/google/cloud/eventarc/publisher_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/eventarc/publishing/v1/publisher.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_OPTIONS_H
-
-#include "google/cloud/eventarc/publisher_connection.h"
-#include "google/cloud/eventarc/publisher_connection_idempotency_policy.h"
-#include "google/cloud/eventarc/publishing/v1/publisher_options.h"
-
-namespace google {
-namespace cloud {
-namespace eventarc {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use eventarc_publishing_v1::PublisherBackoffPolicyOption
-/// directly.
-using ::google::cloud::eventarc_publishing_v1::PublisherBackoffPolicyOption;
-
-/// @deprecated Use
-/// eventarc_publishing_v1::PublisherConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::eventarc_publishing_v1::
-    PublisherConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use eventarc_publishing_v1::PublisherPolicyOptionList directly.
-using ::google::cloud::eventarc_publishing_v1::PublisherPolicyOptionList;
-
-/// @deprecated Use eventarc_publishing_v1::PublisherRetryPolicyOption directly.
-using ::google::cloud::eventarc_publishing_v1::PublisherRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace eventarc
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EVENTARC_PUBLISHER_OPTIONS_H
diff --git a/google/cloud/filestore/BUILD.bazel b/google/cloud/filestore/BUILD.bazel
index ff9759b80166b..e40b464141386 100644
--- a/google/cloud/filestore/BUILD.bazel
+++ b/google/cloud/filestore/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/filestore/CMakeLists.txt b/google/cloud/filestore/CMakeLists.txt
index 57cc0ea26d1ef..de307654a145c 100644
--- a/google/cloud/filestore/CMakeLists.txt
+++ b/google/cloud/filestore/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(filestore "Cloud Filestore API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(filestore_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/filestore/cloud_filestore_manager_client.h b/google/cloud/filestore/cloud_filestore_manager_client.h
deleted file mode 100644
index 9ea078b9d49fa..0000000000000
--- a/google/cloud/filestore/cloud_filestore_manager_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/filestore/v1/cloud_filestore_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_CLIENT_H
-
-#include "google/cloud/filestore/cloud_filestore_manager_connection.h"
-#include "google/cloud/filestore/v1/cloud_filestore_manager_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in filestore_v1 instead of the aliases defined in
-///     this namespace.
-namespace filestore {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use filestore_v1::CloudFilestoreManagerClient directly.
-using ::google::cloud::filestore_v1::CloudFilestoreManagerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace filestore
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_CLIENT_H
diff --git a/google/cloud/filestore/cloud_filestore_manager_connection.h b/google/cloud/filestore/cloud_filestore_manager_connection.h
deleted file mode 100644
index 12109e51a218f..0000000000000
--- a/google/cloud/filestore/cloud_filestore_manager_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/filestore/v1/cloud_filestore_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_CONNECTION_H
-
-#include "google/cloud/filestore/cloud_filestore_manager_connection_idempotency_policy.h"
-#include "google/cloud/filestore/v1/cloud_filestore_manager_connection.h"
-
-namespace google {
-namespace cloud {
-namespace filestore {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use filestore_v1::MakeCloudFilestoreManagerConnection directly.
-using ::google::cloud::filestore_v1::MakeCloudFilestoreManagerConnection;
-
-/// @deprecated Use filestore_v1::CloudFilestoreManagerConnection directly.
-using ::google::cloud::filestore_v1::CloudFilestoreManagerConnection;
-
-/// @deprecated Use
-/// filestore_v1::CloudFilestoreManagerLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::filestore_v1::
-    CloudFilestoreManagerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use filestore_v1::CloudFilestoreManagerLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::filestore_v1::
-    CloudFilestoreManagerLimitedTimeRetryPolicy;
-
-/// @deprecated Use filestore_v1::CloudFilestoreManagerRetryPolicy directly.
-using ::google::cloud::filestore_v1::CloudFilestoreManagerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace filestore
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_CONNECTION_H
diff --git a/google/cloud/filestore/cloud_filestore_manager_connection_idempotency_policy.h b/google/cloud/filestore/cloud_filestore_manager_connection_idempotency_policy.h
deleted file mode 100644
index 4049f83b6dd94..0000000000000
--- a/google/cloud/filestore/cloud_filestore_manager_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/filestore/v1/cloud_filestore_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/filestore/v1/cloud_filestore_manager_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace filestore {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// filestore_v1::MakeDefaultCloudFilestoreManagerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::filestore_v1::
-    MakeDefaultCloudFilestoreManagerConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// filestore_v1::CloudFilestoreManagerConnectionIdempotencyPolicy directly.
-using ::google::cloud::filestore_v1::
-    CloudFilestoreManagerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace filestore
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/filestore/cloud_filestore_manager_options.h b/google/cloud/filestore/cloud_filestore_manager_options.h
deleted file mode 100644
index f3be83d935c33..0000000000000
--- a/google/cloud/filestore/cloud_filestore_manager_options.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/filestore/v1/cloud_filestore_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_OPTIONS_H
-
-#include "google/cloud/filestore/cloud_filestore_manager_connection.h"
-#include "google/cloud/filestore/cloud_filestore_manager_connection_idempotency_policy.h"
-#include "google/cloud/filestore/v1/cloud_filestore_manager_options.h"
-
-namespace google {
-namespace cloud {
-namespace filestore {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use filestore_v1::CloudFilestoreManagerPollingPolicyOption
-/// directly.
-using ::google::cloud::filestore_v1::CloudFilestoreManagerPollingPolicyOption;
-
-/// @deprecated Use filestore_v1::CloudFilestoreManagerBackoffPolicyOption
-/// directly.
-using ::google::cloud::filestore_v1::CloudFilestoreManagerBackoffPolicyOption;
-
-/// @deprecated Use
-/// filestore_v1::CloudFilestoreManagerConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::filestore_v1::
-    CloudFilestoreManagerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use filestore_v1::CloudFilestoreManagerPolicyOptionList
-/// directly.
-using ::google::cloud::filestore_v1::CloudFilestoreManagerPolicyOptionList;
-
-/// @deprecated Use filestore_v1::CloudFilestoreManagerRetryPolicyOption
-/// directly.
-using ::google::cloud::filestore_v1::CloudFilestoreManagerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace filestore
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_CLOUD_FILESTORE_MANAGER_OPTIONS_H
diff --git a/google/cloud/filestore/mocks/mock_cloud_filestore_manager_connection.h b/google/cloud/filestore/mocks/mock_cloud_filestore_manager_connection.h
deleted file mode 100644
index 1b6660805a7d8..0000000000000
--- a/google/cloud/filestore/mocks/mock_cloud_filestore_manager_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/filestore/v1/cloud_filestore_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_MOCKS_MOCK_CLOUD_FILESTORE_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_MOCKS_MOCK_CLOUD_FILESTORE_MANAGER_CONNECTION_H
-
-#include "google/cloud/filestore/cloud_filestore_manager_connection.h"
-#include "google/cloud/filestore/v1/mocks/mock_cloud_filestore_manager_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in filestore_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace filestore_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use filestore_v1_mocks::MockCloudFilestoreManagerConnection
-/// directly.
-using ::google::cloud::filestore_v1_mocks::MockCloudFilestoreManagerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace filestore_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FILESTORE_MOCKS_MOCK_CLOUD_FILESTORE_MANAGER_CONNECTION_H
diff --git a/google/cloud/functions/BUILD.bazel b/google/cloud/functions/BUILD.bazel
index 8053f5d4fffcc..d2b20a38463b4 100644
--- a/google/cloud/functions/BUILD.bazel
+++ b/google/cloud/functions/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "v2/",
 ]
diff --git a/google/cloud/functions/CMakeLists.txt b/google/cloud/functions/CMakeLists.txt
index 8833af98be455..79478486547bf 100644
--- a/google/cloud/functions/CMakeLists.txt
+++ b/google/cloud/functions/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(functions "Cloud Functions API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/" "v2/")
+                                   SERVICE_DIRS "v1/" "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(functions_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/functions/cloud_functions_client.h b/google/cloud/functions/cloud_functions_client.h
deleted file mode 100644
index 4eba2dbee7ebc..0000000000000
--- a/google/cloud/functions/cloud_functions_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/functions/v1/functions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_CLIENT_H
-
-#include "google/cloud/functions/cloud_functions_connection.h"
-#include "google/cloud/functions/v1/cloud_functions_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in functions_v1 instead of the aliases defined in
-///     this namespace.
-namespace functions {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use functions_v1::CloudFunctionsServiceClient directly.
-using ::google::cloud::functions_v1::CloudFunctionsServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace functions
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_CLIENT_H
diff --git a/google/cloud/functions/cloud_functions_connection.h b/google/cloud/functions/cloud_functions_connection.h
deleted file mode 100644
index 5e81aca5245a0..0000000000000
--- a/google/cloud/functions/cloud_functions_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/functions/v1/functions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_CONNECTION_H
-
-#include "google/cloud/functions/cloud_functions_connection_idempotency_policy.h"
-#include "google/cloud/functions/v1/cloud_functions_connection.h"
-
-namespace google {
-namespace cloud {
-namespace functions {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use functions_v1::MakeCloudFunctionsServiceConnection directly.
-using ::google::cloud::functions_v1::MakeCloudFunctionsServiceConnection;
-
-/// @deprecated Use functions_v1::CloudFunctionsServiceConnection directly.
-using ::google::cloud::functions_v1::CloudFunctionsServiceConnection;
-
-/// @deprecated Use
-/// functions_v1::CloudFunctionsServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::functions_v1::
-    CloudFunctionsServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use functions_v1::CloudFunctionsServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::functions_v1::
-    CloudFunctionsServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use functions_v1::CloudFunctionsServiceRetryPolicy directly.
-using ::google::cloud::functions_v1::CloudFunctionsServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace functions
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_CONNECTION_H
diff --git a/google/cloud/functions/cloud_functions_connection_idempotency_policy.h b/google/cloud/functions/cloud_functions_connection_idempotency_policy.h
deleted file mode 100644
index bc16bcc0a9e66..0000000000000
--- a/google/cloud/functions/cloud_functions_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/functions/v1/functions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/functions/v1/cloud_functions_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace functions {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// functions_v1::MakeDefaultCloudFunctionsServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::functions_v1::
-    MakeDefaultCloudFunctionsServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// functions_v1::CloudFunctionsServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::functions_v1::
-    CloudFunctionsServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace functions
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/functions/cloud_functions_options.h b/google/cloud/functions/cloud_functions_options.h
deleted file mode 100644
index 72c4b4d5c279d..0000000000000
--- a/google/cloud/functions/cloud_functions_options.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/functions/v1/functions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_OPTIONS_H
-
-#include "google/cloud/functions/cloud_functions_connection.h"
-#include "google/cloud/functions/cloud_functions_connection_idempotency_policy.h"
-#include "google/cloud/functions/v1/cloud_functions_options.h"
-
-namespace google {
-namespace cloud {
-namespace functions {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use functions_v1::CloudFunctionsServicePollingPolicyOption
-/// directly.
-using ::google::cloud::functions_v1::CloudFunctionsServicePollingPolicyOption;
-
-/// @deprecated Use functions_v1::CloudFunctionsServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::functions_v1::CloudFunctionsServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// functions_v1::CloudFunctionsServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::functions_v1::
-    CloudFunctionsServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use functions_v1::CloudFunctionsServicePolicyOptionList
-/// directly.
-using ::google::cloud::functions_v1::CloudFunctionsServicePolicyOptionList;
-
-/// @deprecated Use functions_v1::CloudFunctionsServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::functions_v1::CloudFunctionsServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace functions
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_CLOUD_FUNCTIONS_OPTIONS_H
diff --git a/google/cloud/functions/mocks/mock_cloud_functions_connection.h b/google/cloud/functions/mocks/mock_cloud_functions_connection.h
deleted file mode 100644
index 99ba612380279..0000000000000
--- a/google/cloud/functions/mocks/mock_cloud_functions_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/functions/v1/functions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_MOCKS_MOCK_CLOUD_FUNCTIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_MOCKS_MOCK_CLOUD_FUNCTIONS_CONNECTION_H
-
-#include "google/cloud/functions/cloud_functions_connection.h"
-#include "google/cloud/functions/v1/mocks/mock_cloud_functions_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in functions_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace functions_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use functions_v1_mocks::MockCloudFunctionsServiceConnection
-/// directly.
-using ::google::cloud::functions_v1_mocks::MockCloudFunctionsServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace functions_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUNCTIONS_MOCKS_MOCK_CLOUD_FUNCTIONS_CONNECTION_H
diff --git a/google/cloud/gkehub/BUILD.bazel b/google/cloud/gkehub/BUILD.bazel
index f7436851376fa..3982f69a77512 100644
--- a/google/cloud/gkehub/BUILD.bazel
+++ b/google/cloud/gkehub/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/gkehub/CMakeLists.txt b/google/cloud/gkehub/CMakeLists.txt
index 04cc750e9d5a3..88670cfbdf966 100644
--- a/google/cloud/gkehub/CMakeLists.txt
+++ b/google/cloud/gkehub/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(gkehub "GKE Hub" SERVICE_DIRS "__EMPTY__"
-                                                                 "v1/")
+google_cloud_cpp_add_gapic_library(gkehub "GKE Hub" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(gkehub_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/gkehub/gke_hub_client.h b/google/cloud/gkehub/gke_hub_client.h
deleted file mode 100644
index c938ec76d1e33..0000000000000
--- a/google/cloud/gkehub/gke_hub_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/gkehub/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_CLIENT_H
-
-#include "google/cloud/gkehub/gke_hub_connection.h"
-#include "google/cloud/gkehub/v1/gke_hub_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in gkehub_v1 instead of the aliases defined in
-///     this namespace.
-namespace gkehub {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use gkehub_v1::GkeHubClient directly.
-using ::google::cloud::gkehub_v1::GkeHubClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace gkehub
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_CLIENT_H
diff --git a/google/cloud/gkehub/gke_hub_connection.h b/google/cloud/gkehub/gke_hub_connection.h
deleted file mode 100644
index c0cc2a3065739..0000000000000
--- a/google/cloud/gkehub/gke_hub_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/gkehub/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_CONNECTION_H
-
-#include "google/cloud/gkehub/gke_hub_connection_idempotency_policy.h"
-#include "google/cloud/gkehub/v1/gke_hub_connection.h"
-
-namespace google {
-namespace cloud {
-namespace gkehub {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use gkehub_v1::MakeGkeHubConnection directly.
-using ::google::cloud::gkehub_v1::MakeGkeHubConnection;
-
-/// @deprecated Use gkehub_v1::GkeHubConnection directly.
-using ::google::cloud::gkehub_v1::GkeHubConnection;
-
-/// @deprecated Use gkehub_v1::GkeHubLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::gkehub_v1::GkeHubLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use gkehub_v1::GkeHubLimitedTimeRetryPolicy directly.
-using ::google::cloud::gkehub_v1::GkeHubLimitedTimeRetryPolicy;
-
-/// @deprecated Use gkehub_v1::GkeHubRetryPolicy directly.
-using ::google::cloud::gkehub_v1::GkeHubRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace gkehub
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_CONNECTION_H
diff --git a/google/cloud/gkehub/gke_hub_connection_idempotency_policy.h b/google/cloud/gkehub/gke_hub_connection_idempotency_policy.h
deleted file mode 100644
index 6a8b93f300b6b..0000000000000
--- a/google/cloud/gkehub/gke_hub_connection_idempotency_policy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/gkehub/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/gkehub/v1/gke_hub_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace gkehub {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use gkehub_v1::MakeDefaultGkeHubConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::gkehub_v1::MakeDefaultGkeHubConnectionIdempotencyPolicy;
-
-/// @deprecated Use gkehub_v1::GkeHubConnectionIdempotencyPolicy directly.
-using ::google::cloud::gkehub_v1::GkeHubConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace gkehub
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/gkehub/gke_hub_options.h b/google/cloud/gkehub/gke_hub_options.h
deleted file mode 100644
index fbb801c9033b7..0000000000000
--- a/google/cloud/gkehub/gke_hub_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/gkehub/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_OPTIONS_H
-
-#include "google/cloud/gkehub/gke_hub_connection.h"
-#include "google/cloud/gkehub/gke_hub_connection_idempotency_policy.h"
-#include "google/cloud/gkehub/v1/gke_hub_options.h"
-
-namespace google {
-namespace cloud {
-namespace gkehub {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use gkehub_v1::GkeHubPollingPolicyOption directly.
-using ::google::cloud::gkehub_v1::GkeHubPollingPolicyOption;
-
-/// @deprecated Use gkehub_v1::GkeHubBackoffPolicyOption directly.
-using ::google::cloud::gkehub_v1::GkeHubBackoffPolicyOption;
-
-/// @deprecated Use gkehub_v1::GkeHubConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::gkehub_v1::GkeHubConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use gkehub_v1::GkeHubPolicyOptionList directly.
-using ::google::cloud::gkehub_v1::GkeHubPolicyOptionList;
-
-/// @deprecated Use gkehub_v1::GkeHubRetryPolicyOption directly.
-using ::google::cloud::gkehub_v1::GkeHubRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace gkehub
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_GKE_HUB_OPTIONS_H
diff --git a/google/cloud/gkehub/mocks/mock_gke_hub_connection.h b/google/cloud/gkehub/mocks/mock_gke_hub_connection.h
deleted file mode 100644
index 05b28ca5ca551..0000000000000
--- a/google/cloud/gkehub/mocks/mock_gke_hub_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/gkehub/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_MOCKS_MOCK_GKE_HUB_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_MOCKS_MOCK_GKE_HUB_CONNECTION_H
-
-#include "google/cloud/gkehub/gke_hub_connection.h"
-#include "google/cloud/gkehub/v1/mocks/mock_gke_hub_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in gkehub_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace gkehub_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use gkehub_v1_mocks::MockGkeHubConnection directly.
-using ::google::cloud::gkehub_v1_mocks::MockGkeHubConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace gkehub_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GKEHUB_MOCKS_MOCK_GKE_HUB_CONNECTION_H
diff --git a/google/cloud/iam/BUILD.bazel b/google/cloud/iam/BUILD.bazel
index 97458a4d5c5a6..ed04e614cbe5e 100644
--- a/google/cloud/iam/BUILD.bazel
+++ b/google/cloud/iam/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "admin/v1/",
     "credentials/v1/",
     "v1/",
diff --git a/google/cloud/iam/iam_client.h b/google/cloud/iam/iam_client.h
deleted file mode 100644
index 23d466ef181cf..0000000000000
--- a/google/cloud/iam/iam_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/admin/v1/iam.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CLIENT_H
-
-#include "google/cloud/iam/admin/v1/iam_client.h"
-#include "google/cloud/iam/iam_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iam_admin_v1 instead of the aliases defined in
-///     this namespace.
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_admin_v1::IAMClient directly.
-using ::google::cloud::iam_admin_v1::IAMClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CLIENT_H
diff --git a/google/cloud/iam/iam_connection.h b/google/cloud/iam/iam_connection.h
deleted file mode 100644
index 7b9fa24f1d8c1..0000000000000
--- a/google/cloud/iam/iam_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/admin/v1/iam.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_H
-
-#include "google/cloud/iam/admin/v1/iam_connection.h"
-#include "google/cloud/iam/iam_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_admin_v1::MakeIAMConnection directly.
-using ::google::cloud::iam_admin_v1::MakeIAMConnection;
-
-/// @deprecated Use iam_admin_v1::IAMConnection directly.
-using ::google::cloud::iam_admin_v1::IAMConnection;
-
-/// @deprecated Use iam_admin_v1::IAMLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::iam_admin_v1::IAMLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use iam_admin_v1::IAMLimitedTimeRetryPolicy directly.
-using ::google::cloud::iam_admin_v1::IAMLimitedTimeRetryPolicy;
-
-/// @deprecated Use iam_admin_v1::IAMRetryPolicy directly.
-using ::google::cloud::iam_admin_v1::IAMRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_H
diff --git a/google/cloud/iam/iam_connection_idempotency_policy.h b/google/cloud/iam/iam_connection_idempotency_policy.h
deleted file mode 100644
index b6fac9be2b1a4..0000000000000
--- a/google/cloud/iam/iam_connection_idempotency_policy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/admin/v1/iam.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_admin_v1::MakeDefaultIAMConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::iam_admin_v1::MakeDefaultIAMConnectionIdempotencyPolicy;
-
-/// @deprecated Use iam_admin_v1::IAMConnectionIdempotencyPolicy directly.
-using ::google::cloud::iam_admin_v1::IAMConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/iam/iam_credentials_client.h b/google/cloud/iam/iam_credentials_client.h
deleted file mode 100644
index 58d28aeae891a..0000000000000
--- a/google/cloud/iam/iam_credentials_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/credentials/v1/iamcredentials.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_CLIENT_H
-
-#include "google/cloud/iam/credentials/v1/iam_credentials_client.h"
-#include "google/cloud/iam/iam_credentials_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iam_credentials_v1 instead of the aliases defined in
-///     this namespace.
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_credentials_v1::IAMCredentialsClient directly.
-using ::google::cloud::iam_credentials_v1::IAMCredentialsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_CLIENT_H
diff --git a/google/cloud/iam/iam_credentials_connection.h b/google/cloud/iam/iam_credentials_connection.h
deleted file mode 100644
index 69c82ac73d1fb..0000000000000
--- a/google/cloud/iam/iam_credentials_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/credentials/v1/iamcredentials.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_CONNECTION_H
-
-#include "google/cloud/iam/credentials/v1/iam_credentials_connection.h"
-#include "google/cloud/iam/iam_credentials_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_credentials_v1::MakeIAMCredentialsConnection directly.
-using ::google::cloud::iam_credentials_v1::MakeIAMCredentialsConnection;
-
-/// @deprecated Use iam_credentials_v1::IAMCredentialsConnection directly.
-using ::google::cloud::iam_credentials_v1::IAMCredentialsConnection;
-
-/// @deprecated Use
-/// iam_credentials_v1::IAMCredentialsLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::iam_credentials_v1::
-    IAMCredentialsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use iam_credentials_v1::IAMCredentialsLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::iam_credentials_v1::IAMCredentialsLimitedTimeRetryPolicy;
-
-/// @deprecated Use iam_credentials_v1::IAMCredentialsRetryPolicy directly.
-using ::google::cloud::iam_credentials_v1::IAMCredentialsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_CONNECTION_H
diff --git a/google/cloud/iam/iam_credentials_connection_idempotency_policy.h b/google/cloud/iam/iam_credentials_connection_idempotency_policy.h
deleted file mode 100644
index 8e2bb6e032b7e..0000000000000
--- a/google/cloud/iam/iam_credentials_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/credentials/v1/iamcredentials.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/iam/credentials/v1/iam_credentials_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// iam_credentials_v1::MakeDefaultIAMCredentialsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::iam_credentials_v1::
-    MakeDefaultIAMCredentialsConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// iam_credentials_v1::IAMCredentialsConnectionIdempotencyPolicy directly.
-using ::google::cloud::iam_credentials_v1::
-    IAMCredentialsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/iam/iam_credentials_options.h b/google/cloud/iam/iam_credentials_options.h
deleted file mode 100644
index 349212e767b53..0000000000000
--- a/google/cloud/iam/iam_credentials_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/credentials/v1/iamcredentials.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_OPTIONS_H
-
-#include "google/cloud/iam/credentials/v1/iam_credentials_options.h"
-#include "google/cloud/iam/iam_credentials_connection.h"
-#include "google/cloud/iam/iam_credentials_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_credentials_v1::IAMCredentialsBackoffPolicyOption
-/// directly.
-using ::google::cloud::iam_credentials_v1::IAMCredentialsBackoffPolicyOption;
-
-/// @deprecated Use
-/// iam_credentials_v1::IAMCredentialsConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::iam_credentials_v1::
-    IAMCredentialsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use iam_credentials_v1::IAMCredentialsPolicyOptionList directly.
-using ::google::cloud::iam_credentials_v1::IAMCredentialsPolicyOptionList;
-
-/// @deprecated Use iam_credentials_v1::IAMCredentialsRetryPolicyOption
-/// directly.
-using ::google::cloud::iam_credentials_v1::IAMCredentialsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CREDENTIALS_OPTIONS_H
diff --git a/google/cloud/iam/iam_options.h b/google/cloud/iam/iam_options.h
deleted file mode 100644
index 62308f44db96c..0000000000000
--- a/google/cloud/iam/iam_options.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/admin/v1/iam.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_OPTIONS_H
-
-#include "google/cloud/iam/admin/v1/iam_options.h"
-#include "google/cloud/iam/iam_connection.h"
-#include "google/cloud/iam/iam_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_admin_v1::IAMBackoffPolicyOption directly.
-using ::google::cloud::iam_admin_v1::IAMBackoffPolicyOption;
-
-/// @deprecated Use iam_admin_v1::IAMConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::iam_admin_v1::IAMConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use iam_admin_v1::IAMPolicyOptionList directly.
-using ::google::cloud::iam_admin_v1::IAMPolicyOptionList;
-
-/// @deprecated Use iam_admin_v1::IAMRetryPolicyOption directly.
-using ::google::cloud::iam_admin_v1::IAMRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_OPTIONS_H
diff --git a/google/cloud/iam/iam_policy_client.h b/google/cloud/iam/iam_policy_client.h
deleted file mode 100644
index 6f0c8d00d998c..0000000000000
--- a/google/cloud/iam/iam_policy_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/v1/iam_policy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_CLIENT_H
-
-#include "google/cloud/iam/iam_policy_connection.h"
-#include "google/cloud/iam/v1/iam_policy_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iam_v1 instead of the aliases defined in
-///     this namespace.
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_v1::IAMPolicyClient directly.
-using ::google::cloud::iam_v1::IAMPolicyClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_CLIENT_H
diff --git a/google/cloud/iam/iam_policy_connection.h b/google/cloud/iam/iam_policy_connection.h
deleted file mode 100644
index 96c252989d305..0000000000000
--- a/google/cloud/iam/iam_policy_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/v1/iam_policy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_CONNECTION_H
-
-#include "google/cloud/iam/iam_policy_connection_idempotency_policy.h"
-#include "google/cloud/iam/v1/iam_policy_connection.h"
-
-namespace google {
-namespace cloud {
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_v1::MakeIAMPolicyConnection directly.
-using ::google::cloud::iam_v1::MakeIAMPolicyConnection;
-
-/// @deprecated Use iam_v1::IAMPolicyConnection directly.
-using ::google::cloud::iam_v1::IAMPolicyConnection;
-
-/// @deprecated Use iam_v1::IAMPolicyLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::iam_v1::IAMPolicyLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use iam_v1::IAMPolicyLimitedTimeRetryPolicy directly.
-using ::google::cloud::iam_v1::IAMPolicyLimitedTimeRetryPolicy;
-
-/// @deprecated Use iam_v1::IAMPolicyRetryPolicy directly.
-using ::google::cloud::iam_v1::IAMPolicyRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_CONNECTION_H
diff --git a/google/cloud/iam/iam_policy_connection_idempotency_policy.h b/google/cloud/iam/iam_policy_connection_idempotency_policy.h
deleted file mode 100644
index 2b379ec37eea9..0000000000000
--- a/google/cloud/iam/iam_policy_connection_idempotency_policy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/v1/iam_policy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/iam/v1/iam_policy_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_v1::MakeDefaultIAMPolicyConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::iam_v1::MakeDefaultIAMPolicyConnectionIdempotencyPolicy;
-
-/// @deprecated Use iam_v1::IAMPolicyConnectionIdempotencyPolicy directly.
-using ::google::cloud::iam_v1::IAMPolicyConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/iam/iam_policy_options.h b/google/cloud/iam/iam_policy_options.h
deleted file mode 100644
index d0e82715d2e5e..0000000000000
--- a/google/cloud/iam/iam_policy_options.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/v1/iam_policy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_OPTIONS_H
-
-#include "google/cloud/iam/iam_policy_connection.h"
-#include "google/cloud/iam/iam_policy_connection_idempotency_policy.h"
-#include "google/cloud/iam/v1/iam_policy_options.h"
-
-namespace google {
-namespace cloud {
-namespace iam {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_v1::IAMPolicyBackoffPolicyOption directly.
-using ::google::cloud::iam_v1::IAMPolicyBackoffPolicyOption;
-
-/// @deprecated Use iam_v1::IAMPolicyConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::iam_v1::IAMPolicyConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use iam_v1::IAMPolicyPolicyOptionList directly.
-using ::google::cloud::iam_v1::IAMPolicyPolicyOptionList;
-
-/// @deprecated Use iam_v1::IAMPolicyRetryPolicyOption directly.
-using ::google::cloud::iam_v1::IAMPolicyRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_POLICY_OPTIONS_H
diff --git a/google/cloud/iam/mocks/mock_iam_connection.h b/google/cloud/iam/mocks/mock_iam_connection.h
deleted file mode 100644
index df785c272b924..0000000000000
--- a/google/cloud/iam/mocks/mock_iam_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/admin/v1/iam.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_CONNECTION_H
-
-#include "google/cloud/iam/admin/v1/mocks/mock_iam_connection.h"
-#include "google/cloud/iam/iam_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iam_admin_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace iam_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_admin_v1_mocks::MockIAMConnection directly.
-using ::google::cloud::iam_admin_v1_mocks::MockIAMConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_CONNECTION_H
diff --git a/google/cloud/iam/mocks/mock_iam_credentials_connection.h b/google/cloud/iam/mocks/mock_iam_credentials_connection.h
deleted file mode 100644
index 64f3534d55567..0000000000000
--- a/google/cloud/iam/mocks/mock_iam_credentials_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/credentials/v1/iamcredentials.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_CREDENTIALS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_CREDENTIALS_CONNECTION_H
-
-#include "google/cloud/iam/credentials/v1/mocks/mock_iam_credentials_connection.h"
-#include "google/cloud/iam/iam_credentials_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iam_credentials_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace iam_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_credentials_v1_mocks::MockIAMCredentialsConnection
-/// directly.
-using ::google::cloud::iam_credentials_v1_mocks::MockIAMCredentialsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_CREDENTIALS_CONNECTION_H
diff --git a/google/cloud/iam/mocks/mock_iam_policy_connection.h b/google/cloud/iam/mocks/mock_iam_policy_connection.h
deleted file mode 100644
index cb6d8120d8548..0000000000000
--- a/google/cloud/iam/mocks/mock_iam_policy_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/iam/v1/iam_policy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_POLICY_CONNECTION_H
-
-#include "google/cloud/iam/iam_policy_connection.h"
-#include "google/cloud/iam/v1/mocks/mock_iam_policy_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iam_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace iam_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iam_v1_mocks::MockIAMPolicyConnection directly.
-using ::google::cloud::iam_v1_mocks::MockIAMPolicyConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_POLICY_CONNECTION_H
diff --git a/google/cloud/iap/BUILD.bazel b/google/cloud/iap/BUILD.bazel
index 7bf413a7c6a9a..b8d8b7e93fef9 100644
--- a/google/cloud/iap/BUILD.bazel
+++ b/google/cloud/iap/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/iap/CMakeLists.txt b/google/cloud/iap/CMakeLists.txt
index 4d1655d136d76..1e97995697cb1 100644
--- a/google/cloud/iap/CMakeLists.txt
+++ b/google/cloud/iap/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(iap "Cloud Identity-Aware Proxy API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(iap_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/iap/identity_aware_proxy_admin_client.h b/google/cloud/iap/identity_aware_proxy_admin_client.h
deleted file mode 100644
index 48826510ce14e..0000000000000
--- a/google/cloud/iap/identity_aware_proxy_admin_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_CLIENT_H
-
-#include "google/cloud/iap/identity_aware_proxy_admin_connection.h"
-#include "google/cloud/iap/v1/identity_aware_proxy_admin_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iap_v1 instead of the aliases defined in
-///     this namespace.
-namespace iap {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iap_v1::IdentityAwareProxyAdminServiceClient directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyAdminServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_CLIENT_H
diff --git a/google/cloud/iap/identity_aware_proxy_admin_connection.h b/google/cloud/iap/identity_aware_proxy_admin_connection.h
deleted file mode 100644
index 02db3605890d8..0000000000000
--- a/google/cloud/iap/identity_aware_proxy_admin_connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_H
-
-#include "google/cloud/iap/identity_aware_proxy_admin_connection_idempotency_policy.h"
-#include "google/cloud/iap/v1/identity_aware_proxy_admin_connection.h"
-
-namespace google {
-namespace cloud {
-namespace iap {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iap_v1::MakeIdentityAwareProxyAdminServiceConnection
-/// directly.
-using ::google::cloud::iap_v1::MakeIdentityAwareProxyAdminServiceConnection;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyAdminServiceConnection directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyAdminServiceConnection;
-
-/// @deprecated Use
-/// iap_v1::IdentityAwareProxyAdminServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyAdminServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyAdminServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyAdminServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyAdminServiceRetryPolicy directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyAdminServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_H
diff --git a/google/cloud/iap/identity_aware_proxy_admin_connection_idempotency_policy.h b/google/cloud/iap/identity_aware_proxy_admin_connection_idempotency_policy.h
deleted file mode 100644
index 3f912c0b19689..0000000000000
--- a/google/cloud/iap/identity_aware_proxy_admin_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/iap/v1/identity_aware_proxy_admin_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace iap {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// iap_v1::MakeDefaultIdentityAwareProxyAdminServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::iap_v1::
-    MakeDefaultIdentityAwareProxyAdminServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// iap_v1::IdentityAwareProxyAdminServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyAdminServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/iap/identity_aware_proxy_admin_options.h b/google/cloud/iap/identity_aware_proxy_admin_options.h
deleted file mode 100644
index 004bde51d63ce..0000000000000
--- a/google/cloud/iap/identity_aware_proxy_admin_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_OPTIONS_H
-
-#include "google/cloud/iap/identity_aware_proxy_admin_connection.h"
-#include "google/cloud/iap/identity_aware_proxy_admin_connection_idempotency_policy.h"
-#include "google/cloud/iap/v1/identity_aware_proxy_admin_options.h"
-
-namespace google {
-namespace cloud {
-namespace iap {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iap_v1::IdentityAwareProxyAdminServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyAdminServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// iap_v1::IdentityAwareProxyAdminServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyAdminServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyAdminServicePolicyOptionList
-/// directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyAdminServicePolicyOptionList;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyAdminServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyAdminServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_ADMIN_OPTIONS_H
diff --git a/google/cloud/iap/identity_aware_proxy_o_auth_client.h b/google/cloud/iap/identity_aware_proxy_o_auth_client.h
deleted file mode 100644
index 4afb153b76f4f..0000000000000
--- a/google/cloud/iap/identity_aware_proxy_o_auth_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_CLIENT_H
-
-#include "google/cloud/iap/identity_aware_proxy_o_auth_connection.h"
-#include "google/cloud/iap/v1/identity_aware_proxy_o_auth_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iap_v1 instead of the aliases defined in
-///     this namespace.
-namespace iap {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iap_v1::IdentityAwareProxyOAuthServiceClient directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyOAuthServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_CLIENT_H
diff --git a/google/cloud/iap/identity_aware_proxy_o_auth_connection.h b/google/cloud/iap/identity_aware_proxy_o_auth_connection.h
deleted file mode 100644
index 784d3421b8550..0000000000000
--- a/google/cloud/iap/identity_aware_proxy_o_auth_connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_H
-
-#include "google/cloud/iap/identity_aware_proxy_o_auth_connection_idempotency_policy.h"
-#include "google/cloud/iap/v1/identity_aware_proxy_o_auth_connection.h"
-
-namespace google {
-namespace cloud {
-namespace iap {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iap_v1::MakeIdentityAwareProxyOAuthServiceConnection
-/// directly.
-using ::google::cloud::iap_v1::MakeIdentityAwareProxyOAuthServiceConnection;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyOAuthServiceConnection directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyOAuthServiceConnection;
-
-/// @deprecated Use
-/// iap_v1::IdentityAwareProxyOAuthServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyOAuthServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyOAuthServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyOAuthServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyOAuthServiceRetryPolicy directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyOAuthServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_H
diff --git a/google/cloud/iap/identity_aware_proxy_o_auth_connection_idempotency_policy.h b/google/cloud/iap/identity_aware_proxy_o_auth_connection_idempotency_policy.h
deleted file mode 100644
index ea22c9d76f71a..0000000000000
--- a/google/cloud/iap/identity_aware_proxy_o_auth_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/iap/v1/identity_aware_proxy_o_auth_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace iap {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// iap_v1::MakeDefaultIdentityAwareProxyOAuthServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::iap_v1::
-    MakeDefaultIdentityAwareProxyOAuthServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// iap_v1::IdentityAwareProxyOAuthServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyOAuthServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/iap/identity_aware_proxy_o_auth_options.h b/google/cloud/iap/identity_aware_proxy_o_auth_options.h
deleted file mode 100644
index fb186efd50ceb..0000000000000
--- a/google/cloud/iap/identity_aware_proxy_o_auth_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_OPTIONS_H
-
-#include "google/cloud/iap/identity_aware_proxy_o_auth_connection.h"
-#include "google/cloud/iap/identity_aware_proxy_o_auth_connection_idempotency_policy.h"
-#include "google/cloud/iap/v1/identity_aware_proxy_o_auth_options.h"
-
-namespace google {
-namespace cloud {
-namespace iap {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iap_v1::IdentityAwareProxyOAuthServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyOAuthServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// iap_v1::IdentityAwareProxyOAuthServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::iap_v1::
-    IdentityAwareProxyOAuthServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyOAuthServicePolicyOptionList
-/// directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyOAuthServicePolicyOptionList;
-
-/// @deprecated Use iap_v1::IdentityAwareProxyOAuthServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::iap_v1::IdentityAwareProxyOAuthServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_IDENTITY_AWARE_PROXY_O_AUTH_OPTIONS_H
diff --git a/google/cloud/iap/mocks/mock_identity_aware_proxy_admin_connection.h b/google/cloud/iap/mocks/mock_identity_aware_proxy_admin_connection.h
deleted file mode 100644
index c37621478748b..0000000000000
--- a/google/cloud/iap/mocks/mock_identity_aware_proxy_admin_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_MOCKS_MOCK_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_MOCKS_MOCK_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_H
-
-#include "google/cloud/iap/identity_aware_proxy_admin_connection.h"
-#include "google/cloud/iap/v1/mocks/mock_identity_aware_proxy_admin_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iap_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace iap_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iap_v1_mocks::MockIdentityAwareProxyAdminServiceConnection
-/// directly.
-using ::google::cloud::iap_v1_mocks::
-    MockIdentityAwareProxyAdminServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_MOCKS_MOCK_IDENTITY_AWARE_PROXY_ADMIN_CONNECTION_H
diff --git a/google/cloud/iap/mocks/mock_identity_aware_proxy_o_auth_connection.h b/google/cloud/iap/mocks/mock_identity_aware_proxy_o_auth_connection.h
deleted file mode 100644
index 928b029397cd2..0000000000000
--- a/google/cloud/iap/mocks/mock_identity_aware_proxy_o_auth_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/iap/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_MOCKS_MOCK_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_MOCKS_MOCK_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_H
-
-#include "google/cloud/iap/identity_aware_proxy_o_auth_connection.h"
-#include "google/cloud/iap/v1/mocks/mock_identity_aware_proxy_o_auth_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in iap_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace iap_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use iap_v1_mocks::MockIdentityAwareProxyOAuthServiceConnection
-/// directly.
-using ::google::cloud::iap_v1_mocks::
-    MockIdentityAwareProxyOAuthServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iap_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAP_MOCKS_MOCK_IDENTITY_AWARE_PROXY_O_AUTH_CONNECTION_H
diff --git a/google/cloud/ids/BUILD.bazel b/google/cloud/ids/BUILD.bazel
index 7dde39a2eb481..a51b24e2fdc45 100644
--- a/google/cloud/ids/BUILD.bazel
+++ b/google/cloud/ids/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/ids/CMakeLists.txt b/google/cloud/ids/CMakeLists.txt
index 5e3df422f96b9..a4c1257eaf7a6 100644
--- a/google/cloud/ids/CMakeLists.txt
+++ b/google/cloud/ids/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(ids "Cloud IDS API" SERVICE_DIRS "__EMPTY__"
-                                                                    "v1/")
+google_cloud_cpp_add_gapic_library(ids "Cloud IDS API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(ids_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/ids/ids_client.h b/google/cloud/ids/ids_client.h
deleted file mode 100644
index e351ee08b2a9e..0000000000000
--- a/google/cloud/ids/ids_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/ids/v1/ids.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_CLIENT_H
-
-#include "google/cloud/ids/ids_connection.h"
-#include "google/cloud/ids/v1/ids_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in ids_v1 instead of the aliases defined in
-///     this namespace.
-namespace ids {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use ids_v1::IDSClient directly.
-using ::google::cloud::ids_v1::IDSClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace ids
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_CLIENT_H
diff --git a/google/cloud/ids/ids_connection.h b/google/cloud/ids/ids_connection.h
deleted file mode 100644
index 96d3cc1ff9a5b..0000000000000
--- a/google/cloud/ids/ids_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/ids/v1/ids.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_CONNECTION_H
-
-#include "google/cloud/ids/ids_connection_idempotency_policy.h"
-#include "google/cloud/ids/v1/ids_connection.h"
-
-namespace google {
-namespace cloud {
-namespace ids {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use ids_v1::MakeIDSConnection directly.
-using ::google::cloud::ids_v1::MakeIDSConnection;
-
-/// @deprecated Use ids_v1::IDSConnection directly.
-using ::google::cloud::ids_v1::IDSConnection;
-
-/// @deprecated Use ids_v1::IDSLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::ids_v1::IDSLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use ids_v1::IDSLimitedTimeRetryPolicy directly.
-using ::google::cloud::ids_v1::IDSLimitedTimeRetryPolicy;
-
-/// @deprecated Use ids_v1::IDSRetryPolicy directly.
-using ::google::cloud::ids_v1::IDSRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace ids
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_CONNECTION_H
diff --git a/google/cloud/ids/ids_connection_idempotency_policy.h b/google/cloud/ids/ids_connection_idempotency_policy.h
deleted file mode 100644
index 86dc42850632d..0000000000000
--- a/google/cloud/ids/ids_connection_idempotency_policy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/ids/v1/ids.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/ids/v1/ids_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace ids {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use ids_v1::MakeDefaultIDSConnectionIdempotencyPolicy directly.
-using ::google::cloud::ids_v1::MakeDefaultIDSConnectionIdempotencyPolicy;
-
-/// @deprecated Use ids_v1::IDSConnectionIdempotencyPolicy directly.
-using ::google::cloud::ids_v1::IDSConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace ids
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/ids/ids_options.h b/google/cloud/ids/ids_options.h
deleted file mode 100644
index b7c81f070b0ea..0000000000000
--- a/google/cloud/ids/ids_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/ids/v1/ids.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_OPTIONS_H
-
-#include "google/cloud/ids/ids_connection.h"
-#include "google/cloud/ids/ids_connection_idempotency_policy.h"
-#include "google/cloud/ids/v1/ids_options.h"
-
-namespace google {
-namespace cloud {
-namespace ids {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use ids_v1::IDSPollingPolicyOption directly.
-using ::google::cloud::ids_v1::IDSPollingPolicyOption;
-
-/// @deprecated Use ids_v1::IDSBackoffPolicyOption directly.
-using ::google::cloud::ids_v1::IDSBackoffPolicyOption;
-
-/// @deprecated Use ids_v1::IDSConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::ids_v1::IDSConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use ids_v1::IDSPolicyOptionList directly.
-using ::google::cloud::ids_v1::IDSPolicyOptionList;
-
-/// @deprecated Use ids_v1::IDSRetryPolicyOption directly.
-using ::google::cloud::ids_v1::IDSRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace ids
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_IDS_OPTIONS_H
diff --git a/google/cloud/ids/mocks/mock_ids_connection.h b/google/cloud/ids/mocks/mock_ids_connection.h
deleted file mode 100644
index a292e01ec5a96..0000000000000
--- a/google/cloud/ids/mocks/mock_ids_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/ids/v1/ids.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_MOCKS_MOCK_IDS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_MOCKS_MOCK_IDS_CONNECTION_H
-
-#include "google/cloud/ids/ids_connection.h"
-#include "google/cloud/ids/v1/mocks/mock_ids_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in ids_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace ids_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use ids_v1_mocks::MockIDSConnection directly.
-using ::google::cloud::ids_v1_mocks::MockIDSConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace ids_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IDS_MOCKS_MOCK_IDS_CONNECTION_H
diff --git a/google/cloud/kms/BUILD.bazel b/google/cloud/kms/BUILD.bazel
index eca0ea6ff0b3e..e75162e2fed41 100644
--- a/google/cloud/kms/BUILD.bazel
+++ b/google/cloud/kms/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "inventory/v1/",
     "v1/",
 ]
diff --git a/google/cloud/kms/CMakeLists.txt b/google/cloud/kms/CMakeLists.txt
index cea5f8e50e69d..d7b9db41b6856 100644
--- a/google/cloud/kms/CMakeLists.txt
+++ b/google/cloud/kms/CMakeLists.txt
@@ -16,9 +16,8 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(
-    kms "Cloud Key Management Service (KMS) API"
-    SERVICE_DIRS "__EMPTY__" "inventory/v1/" "v1/")
+google_cloud_cpp_add_gapic_library(kms "Cloud Key Management Service (KMS) API"
+                                   SERVICE_DIRS "inventory/v1/" "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(kms_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/kms/ekm_client.h b/google/cloud/kms/ekm_client.h
deleted file mode 100644
index 56faddbd8facb..0000000000000
--- a/google/cloud/kms/ekm_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/ekm_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_CLIENT_H
-
-#include "google/cloud/kms/ekm_connection.h"
-#include "google/cloud/kms/v1/ekm_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in kms_v1 instead of the aliases defined in
-///     this namespace.
-namespace kms {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use kms_v1::EkmServiceClient directly.
-using ::google::cloud::kms_v1::EkmServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_CLIENT_H
diff --git a/google/cloud/kms/ekm_connection.h b/google/cloud/kms/ekm_connection.h
deleted file mode 100644
index d6244cc09b5b9..0000000000000
--- a/google/cloud/kms/ekm_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/ekm_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_CONNECTION_H
-
-#include "google/cloud/kms/ekm_connection_idempotency_policy.h"
-#include "google/cloud/kms/v1/ekm_connection.h"
-
-namespace google {
-namespace cloud {
-namespace kms {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use kms_v1::MakeEkmServiceConnection directly.
-using ::google::cloud::kms_v1::MakeEkmServiceConnection;
-
-/// @deprecated Use kms_v1::EkmServiceConnection directly.
-using ::google::cloud::kms_v1::EkmServiceConnection;
-
-/// @deprecated Use kms_v1::EkmServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::kms_v1::EkmServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use kms_v1::EkmServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::kms_v1::EkmServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use kms_v1::EkmServiceRetryPolicy directly.
-using ::google::cloud::kms_v1::EkmServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_CONNECTION_H
diff --git a/google/cloud/kms/ekm_connection_idempotency_policy.h b/google/cloud/kms/ekm_connection_idempotency_policy.h
deleted file mode 100644
index cf9eb7f54a97e..0000000000000
--- a/google/cloud/kms/ekm_connection_idempotency_policy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/ekm_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/kms/v1/ekm_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace kms {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use kms_v1::MakeDefaultEkmServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::kms_v1::MakeDefaultEkmServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use kms_v1::EkmServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::kms_v1::EkmServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/kms/ekm_options.h b/google/cloud/kms/ekm_options.h
deleted file mode 100644
index 1e2062d19d97d..0000000000000
--- a/google/cloud/kms/ekm_options.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/ekm_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_OPTIONS_H
-
-#include "google/cloud/kms/ekm_connection.h"
-#include "google/cloud/kms/ekm_connection_idempotency_policy.h"
-#include "google/cloud/kms/v1/ekm_options.h"
-
-namespace google {
-namespace cloud {
-namespace kms {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use kms_v1::EkmServiceBackoffPolicyOption directly.
-using ::google::cloud::kms_v1::EkmServiceBackoffPolicyOption;
-
-/// @deprecated Use kms_v1::EkmServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::kms_v1::EkmServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use kms_v1::EkmServicePolicyOptionList directly.
-using ::google::cloud::kms_v1::EkmServicePolicyOptionList;
-
-/// @deprecated Use kms_v1::EkmServiceRetryPolicyOption directly.
-using ::google::cloud::kms_v1::EkmServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_EKM_OPTIONS_H
diff --git a/google/cloud/kms/key_management_client.h b/google/cloud/kms/key_management_client.h
deleted file mode 100644
index 82b71278498be..0000000000000
--- a/google/cloud/kms/key_management_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_CLIENT_H
-
-#include "google/cloud/kms/key_management_connection.h"
-#include "google/cloud/kms/v1/key_management_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in kms_v1 instead of the aliases defined in
-///     this namespace.
-namespace kms {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use kms_v1::KeyManagementServiceClient directly.
-using ::google::cloud::kms_v1::KeyManagementServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_CLIENT_H
diff --git a/google/cloud/kms/key_management_connection.h b/google/cloud/kms/key_management_connection.h
deleted file mode 100644
index 8e392c0818f2d..0000000000000
--- a/google/cloud/kms/key_management_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_CONNECTION_H
-
-#include "google/cloud/kms/key_management_connection_idempotency_policy.h"
-#include "google/cloud/kms/v1/key_management_connection.h"
-
-namespace google {
-namespace cloud {
-namespace kms {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use kms_v1::MakeKeyManagementServiceConnection directly.
-using ::google::cloud::kms_v1::MakeKeyManagementServiceConnection;
-
-/// @deprecated Use kms_v1::KeyManagementServiceConnection directly.
-using ::google::cloud::kms_v1::KeyManagementServiceConnection;
-
-/// @deprecated Use kms_v1::KeyManagementServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::kms_v1::KeyManagementServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use kms_v1::KeyManagementServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::kms_v1::KeyManagementServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use kms_v1::KeyManagementServiceRetryPolicy directly.
-using ::google::cloud::kms_v1::KeyManagementServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_CONNECTION_H
diff --git a/google/cloud/kms/key_management_connection_idempotency_policy.h b/google/cloud/kms/key_management_connection_idempotency_policy.h
deleted file mode 100644
index 76a66df55e3c7..0000000000000
--- a/google/cloud/kms/key_management_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/kms/v1/key_management_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace kms {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// kms_v1::MakeDefaultKeyManagementServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::kms_v1::
-    MakeDefaultKeyManagementServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use kms_v1::KeyManagementServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::kms_v1::KeyManagementServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/kms/key_management_options.h b/google/cloud/kms/key_management_options.h
deleted file mode 100644
index 6c0a7bbbd500c..0000000000000
--- a/google/cloud/kms/key_management_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_OPTIONS_H
-
-#include "google/cloud/kms/key_management_connection.h"
-#include "google/cloud/kms/key_management_connection_idempotency_policy.h"
-#include "google/cloud/kms/v1/key_management_options.h"
-
-namespace google {
-namespace cloud {
-namespace kms {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use kms_v1::KeyManagementServiceBackoffPolicyOption directly.
-using ::google::cloud::kms_v1::KeyManagementServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// kms_v1::KeyManagementServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::kms_v1::
-    KeyManagementServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use kms_v1::KeyManagementServicePolicyOptionList directly.
-using ::google::cloud::kms_v1::KeyManagementServicePolicyOptionList;
-
-/// @deprecated Use kms_v1::KeyManagementServiceRetryPolicyOption directly.
-using ::google::cloud::kms_v1::KeyManagementServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_KEY_MANAGEMENT_OPTIONS_H
diff --git a/google/cloud/kms/mocks/mock_ekm_connection.h b/google/cloud/kms/mocks/mock_ekm_connection.h
deleted file mode 100644
index 092aec1c2c071..0000000000000
--- a/google/cloud/kms/mocks/mock_ekm_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/ekm_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_MOCKS_MOCK_EKM_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_MOCKS_MOCK_EKM_CONNECTION_H
-
-#include "google/cloud/kms/ekm_connection.h"
-#include "google/cloud/kms/v1/mocks/mock_ekm_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in kms_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace kms_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use kms_v1_mocks::MockEkmServiceConnection directly.
-using ::google::cloud::kms_v1_mocks::MockEkmServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_MOCKS_MOCK_EKM_CONNECTION_H
diff --git a/google/cloud/kms/mocks/mock_key_management_connection.h b/google/cloud/kms/mocks/mock_key_management_connection.h
deleted file mode 100644
index d9ebb4b3fc861..0000000000000
--- a/google/cloud/kms/mocks/mock_key_management_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/kms/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_MOCKS_MOCK_KEY_MANAGEMENT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_MOCKS_MOCK_KEY_MANAGEMENT_CONNECTION_H
-
-#include "google/cloud/kms/key_management_connection.h"
-#include "google/cloud/kms/v1/mocks/mock_key_management_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in kms_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace kms_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use kms_v1_mocks::MockKeyManagementServiceConnection directly.
-using ::google::cloud::kms_v1_mocks::MockKeyManagementServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace kms_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_KMS_MOCKS_MOCK_KEY_MANAGEMENT_CONNECTION_H
diff --git a/google/cloud/language/BUILD.bazel b/google/cloud/language/BUILD.bazel
index 5d4e81a3dd6ae..db0bc85f2a398 100644
--- a/google/cloud/language/BUILD.bazel
+++ b/google/cloud/language/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "v2/",
 ]
diff --git a/google/cloud/language/CMakeLists.txt b/google/cloud/language/CMakeLists.txt
index 7911539230d1c..a199360edfc53 100644
--- a/google/cloud/language/CMakeLists.txt
+++ b/google/cloud/language/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(language "Cloud Natural Language API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/" "v2/")
+                                   SERVICE_DIRS "v1/" "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(language_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/language/language_client.h b/google/cloud/language/language_client.h
deleted file mode 100644
index 7659d231f38aa..0000000000000
--- a/google/cloud/language/language_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/language/v1/language_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_CLIENT_H
-
-#include "google/cloud/language/language_connection.h"
-#include "google/cloud/language/v1/language_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in language_v1 instead of the aliases defined in
-///     this namespace.
-namespace language {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use language_v1::LanguageServiceClient directly.
-using ::google::cloud::language_v1::LanguageServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace language
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_CLIENT_H
diff --git a/google/cloud/language/language_connection.h b/google/cloud/language/language_connection.h
deleted file mode 100644
index 25e0235472509..0000000000000
--- a/google/cloud/language/language_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/language/v1/language_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_CONNECTION_H
-
-#include "google/cloud/language/language_connection_idempotency_policy.h"
-#include "google/cloud/language/v1/language_connection.h"
-
-namespace google {
-namespace cloud {
-namespace language {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use language_v1::MakeLanguageServiceConnection directly.
-using ::google::cloud::language_v1::MakeLanguageServiceConnection;
-
-/// @deprecated Use language_v1::LanguageServiceConnection directly.
-using ::google::cloud::language_v1::LanguageServiceConnection;
-
-/// @deprecated Use language_v1::LanguageServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::language_v1::LanguageServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use language_v1::LanguageServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::language_v1::LanguageServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use language_v1::LanguageServiceRetryPolicy directly.
-using ::google::cloud::language_v1::LanguageServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace language
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_CONNECTION_H
diff --git a/google/cloud/language/language_connection_idempotency_policy.h b/google/cloud/language/language_connection_idempotency_policy.h
deleted file mode 100644
index 9df748f4f034b..0000000000000
--- a/google/cloud/language/language_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/language/v1/language_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/language/v1/language_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace language {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// language_v1::MakeDefaultLanguageServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::language_v1::
-    MakeDefaultLanguageServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use language_v1::LanguageServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::language_v1::LanguageServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace language
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/language/language_options.h b/google/cloud/language/language_options.h
deleted file mode 100644
index 21d7791187151..0000000000000
--- a/google/cloud/language/language_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/language/v1/language_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_OPTIONS_H
-
-#include "google/cloud/language/language_connection.h"
-#include "google/cloud/language/language_connection_idempotency_policy.h"
-#include "google/cloud/language/v1/language_options.h"
-
-namespace google {
-namespace cloud {
-namespace language {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use language_v1::LanguageServiceBackoffPolicyOption directly.
-using ::google::cloud::language_v1::LanguageServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// language_v1::LanguageServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::language_v1::
-    LanguageServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use language_v1::LanguageServicePolicyOptionList directly.
-using ::google::cloud::language_v1::LanguageServicePolicyOptionList;
-
-/// @deprecated Use language_v1::LanguageServiceRetryPolicyOption directly.
-using ::google::cloud::language_v1::LanguageServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace language
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_LANGUAGE_OPTIONS_H
diff --git a/google/cloud/language/mocks/mock_language_connection.h b/google/cloud/language/mocks/mock_language_connection.h
deleted file mode 100644
index 04ffef268396c..0000000000000
--- a/google/cloud/language/mocks/mock_language_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/language/v1/language_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_MOCKS_MOCK_LANGUAGE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_MOCKS_MOCK_LANGUAGE_CONNECTION_H
-
-#include "google/cloud/language/language_connection.h"
-#include "google/cloud/language/v1/mocks/mock_language_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in language_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace language_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use language_v1_mocks::MockLanguageServiceConnection directly.
-using ::google::cloud::language_v1_mocks::MockLanguageServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace language_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LANGUAGE_MOCKS_MOCK_LANGUAGE_CONNECTION_H
diff --git a/google/cloud/logging/BUILD.bazel b/google/cloud/logging/BUILD.bazel
index 2407eff343c64..c9784acb0deda 100644
--- a/google/cloud/logging/BUILD.bazel
+++ b/google/cloud/logging/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v2/",
 ]
 
diff --git a/google/cloud/logging/CMakeLists.txt b/google/cloud/logging/CMakeLists.txt
index 4ed26c3c0913d..4e94122416f4e 100644
--- a/google/cloud/logging/CMakeLists.txt
+++ b/google/cloud/logging/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     logging "Cloud Logging API"
-    SERVICE_DIRS "__EMPTY__" "v2/"
+    SERVICE_DIRS "v2/"
     SHARED_PROTO_DEPS "logging_type"
     BACKWARDS_COMPAT_PROTO_TARGETS "logging_type_type_protos")
 
diff --git a/google/cloud/logging/logging_service_v2_client.h b/google/cloud/logging/logging_service_v2_client.h
deleted file mode 100644
index 4a63038a2079b..0000000000000
--- a/google/cloud/logging/logging_service_v2_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/logging/v2/logging.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_CLIENT_H
-
-#include "google/cloud/logging/logging_service_v2_connection.h"
-#include "google/cloud/logging/v2/logging_service_v2_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in logging_v2 instead of the aliases defined in
-///     this namespace.
-namespace logging {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use logging_v2::LoggingServiceV2Client directly.
-using ::google::cloud::logging_v2::LoggingServiceV2Client;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace logging
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_CLIENT_H
diff --git a/google/cloud/logging/logging_service_v2_connection.h b/google/cloud/logging/logging_service_v2_connection.h
deleted file mode 100644
index 6e8c6328372f9..0000000000000
--- a/google/cloud/logging/logging_service_v2_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/logging/v2/logging.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_CONNECTION_H
-
-#include "google/cloud/logging/logging_service_v2_connection_idempotency_policy.h"
-#include "google/cloud/logging/v2/logging_service_v2_connection.h"
-
-namespace google {
-namespace cloud {
-namespace logging {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use logging_v2::MakeLoggingServiceV2Connection directly.
-using ::google::cloud::logging_v2::MakeLoggingServiceV2Connection;
-
-/// @deprecated Use logging_v2::LoggingServiceV2Connection directly.
-using ::google::cloud::logging_v2::LoggingServiceV2Connection;
-
-/// @deprecated Use logging_v2::LoggingServiceV2LimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::logging_v2::LoggingServiceV2LimitedErrorCountRetryPolicy;
-
-/// @deprecated Use logging_v2::LoggingServiceV2LimitedTimeRetryPolicy directly.
-using ::google::cloud::logging_v2::LoggingServiceV2LimitedTimeRetryPolicy;
-
-/// @deprecated Use logging_v2::LoggingServiceV2RetryPolicy directly.
-using ::google::cloud::logging_v2::LoggingServiceV2RetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace logging
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_CONNECTION_H
diff --git a/google/cloud/logging/logging_service_v2_connection_idempotency_policy.h b/google/cloud/logging/logging_service_v2_connection_idempotency_policy.h
deleted file mode 100644
index bf6becb4dfe59..0000000000000
--- a/google/cloud/logging/logging_service_v2_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/logging/v2/logging.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/logging/v2/logging_service_v2_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace logging {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// logging_v2::MakeDefaultLoggingServiceV2ConnectionIdempotencyPolicy directly.
-using ::google::cloud::logging_v2::
-    MakeDefaultLoggingServiceV2ConnectionIdempotencyPolicy;
-
-/// @deprecated Use logging_v2::LoggingServiceV2ConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::logging_v2::LoggingServiceV2ConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace logging
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/logging/logging_service_v2_options.h b/google/cloud/logging/logging_service_v2_options.h
deleted file mode 100644
index 4da2887298b94..0000000000000
--- a/google/cloud/logging/logging_service_v2_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/logging/v2/logging.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_OPTIONS_H
-
-#include "google/cloud/logging/logging_service_v2_connection.h"
-#include "google/cloud/logging/logging_service_v2_connection_idempotency_policy.h"
-#include "google/cloud/logging/v2/logging_service_v2_options.h"
-
-namespace google {
-namespace cloud {
-namespace logging {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use logging_v2::LoggingServiceV2BackoffPolicyOption directly.
-using ::google::cloud::logging_v2::LoggingServiceV2BackoffPolicyOption;
-
-/// @deprecated Use
-/// logging_v2::LoggingServiceV2ConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::logging_v2::
-    LoggingServiceV2ConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use logging_v2::LoggingServiceV2PolicyOptionList directly.
-using ::google::cloud::logging_v2::LoggingServiceV2PolicyOptionList;
-
-/// @deprecated Use logging_v2::LoggingServiceV2RetryPolicyOption directly.
-using ::google::cloud::logging_v2::LoggingServiceV2RetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace logging
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_LOGGING_SERVICE_V2_OPTIONS_H
diff --git a/google/cloud/logging/mocks/mock_logging_service_v2_connection.h b/google/cloud/logging/mocks/mock_logging_service_v2_connection.h
deleted file mode 100644
index 0db00ce132177..0000000000000
--- a/google/cloud/logging/mocks/mock_logging_service_v2_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/logging/v2/logging.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_MOCKS_MOCK_LOGGING_SERVICE_V2_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_MOCKS_MOCK_LOGGING_SERVICE_V2_CONNECTION_H
-
-#include "google/cloud/logging/logging_service_v2_connection.h"
-#include "google/cloud/logging/v2/mocks/mock_logging_service_v2_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in logging_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace logging_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use logging_v2_mocks::MockLoggingServiceV2Connection directly.
-using ::google::cloud::logging_v2_mocks::MockLoggingServiceV2Connection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace logging_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_LOGGING_MOCKS_MOCK_LOGGING_SERVICE_V2_CONNECTION_H
diff --git a/google/cloud/managedidentities/BUILD.bazel b/google/cloud/managedidentities/BUILD.bazel
index d213734daa1ca..950c20635600e 100644
--- a/google/cloud/managedidentities/BUILD.bazel
+++ b/google/cloud/managedidentities/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/managedidentities/CMakeLists.txt b/google/cloud/managedidentities/CMakeLists.txt
index 5d2cdc2e1c187..c15aca14518a5 100644
--- a/google/cloud/managedidentities/CMakeLists.txt
+++ b/google/cloud/managedidentities/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     managedidentities "Managed Service for Microsoft Active Directory API"
-    SERVICE_DIRS "__EMPTY__" "v1/")
+    SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(managedidentities_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/managedidentities/managed_identities_client.h b/google/cloud/managedidentities/managed_identities_client.h
deleted file mode 100644
index a755ff28f2ec9..0000000000000
--- a/google/cloud/managedidentities/managed_identities_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/managedidentities/v1/managed_identities_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_CLIENT_H
-
-#include "google/cloud/managedidentities/managed_identities_connection.h"
-#include "google/cloud/managedidentities/v1/managed_identities_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in managedidentities_v1 instead of the aliases defined in
-///     this namespace.
-namespace managedidentities {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use managedidentities_v1::ManagedIdentitiesServiceClient
-/// directly.
-using ::google::cloud::managedidentities_v1::ManagedIdentitiesServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace managedidentities
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_CLIENT_H
diff --git a/google/cloud/managedidentities/managed_identities_connection.h b/google/cloud/managedidentities/managed_identities_connection.h
deleted file mode 100644
index 2eaa141623afa..0000000000000
--- a/google/cloud/managedidentities/managed_identities_connection.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/managedidentities/v1/managed_identities_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_CONNECTION_H
-
-#include "google/cloud/managedidentities/managed_identities_connection_idempotency_policy.h"
-#include "google/cloud/managedidentities/v1/managed_identities_connection.h"
-
-namespace google {
-namespace cloud {
-namespace managedidentities {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use managedidentities_v1::MakeManagedIdentitiesServiceConnection
-/// directly.
-using ::google::cloud::managedidentities_v1::
-    MakeManagedIdentitiesServiceConnection;
-
-/// @deprecated Use managedidentities_v1::ManagedIdentitiesServiceConnection
-/// directly.
-using ::google::cloud::managedidentities_v1::ManagedIdentitiesServiceConnection;
-
-/// @deprecated Use
-/// managedidentities_v1::ManagedIdentitiesServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::managedidentities_v1::
-    ManagedIdentitiesServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// managedidentities_v1::ManagedIdentitiesServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::managedidentities_v1::
-    ManagedIdentitiesServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use managedidentities_v1::ManagedIdentitiesServiceRetryPolicy
-/// directly.
-using ::google::cloud::managedidentities_v1::
-    ManagedIdentitiesServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace managedidentities
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_CONNECTION_H
diff --git a/google/cloud/managedidentities/managed_identities_connection_idempotency_policy.h b/google/cloud/managedidentities/managed_identities_connection_idempotency_policy.h
deleted file mode 100644
index f5bd8ac9977d5..0000000000000
--- a/google/cloud/managedidentities/managed_identities_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/managedidentities/v1/managed_identities_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/managedidentities/v1/managed_identities_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace managedidentities {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// managedidentities_v1::MakeDefaultManagedIdentitiesServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::managedidentities_v1::
-    MakeDefaultManagedIdentitiesServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// managedidentities_v1::ManagedIdentitiesServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::managedidentities_v1::
-    ManagedIdentitiesServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace managedidentities
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/managedidentities/managed_identities_options.h b/google/cloud/managedidentities/managed_identities_options.h
deleted file mode 100644
index 52a9874d016b1..0000000000000
--- a/google/cloud/managedidentities/managed_identities_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/managedidentities/v1/managed_identities_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_OPTIONS_H
-
-#include "google/cloud/managedidentities/managed_identities_connection.h"
-#include "google/cloud/managedidentities/managed_identities_connection_idempotency_policy.h"
-#include "google/cloud/managedidentities/v1/managed_identities_options.h"
-
-namespace google {
-namespace cloud {
-namespace managedidentities {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// managedidentities_v1::ManagedIdentitiesServicePollingPolicyOption directly.
-using ::google::cloud::managedidentities_v1::
-    ManagedIdentitiesServicePollingPolicyOption;
-
-/// @deprecated Use
-/// managedidentities_v1::ManagedIdentitiesServiceBackoffPolicyOption directly.
-using ::google::cloud::managedidentities_v1::
-    ManagedIdentitiesServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// managedidentities_v1::ManagedIdentitiesServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::managedidentities_v1::
-    ManagedIdentitiesServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// managedidentities_v1::ManagedIdentitiesServicePolicyOptionList directly.
-using ::google::cloud::managedidentities_v1::
-    ManagedIdentitiesServicePolicyOptionList;
-
-/// @deprecated Use
-/// managedidentities_v1::ManagedIdentitiesServiceRetryPolicyOption directly.
-using ::google::cloud::managedidentities_v1::
-    ManagedIdentitiesServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace managedidentities
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MANAGED_IDENTITIES_OPTIONS_H
diff --git a/google/cloud/managedidentities/mocks/mock_managed_identities_connection.h b/google/cloud/managedidentities/mocks/mock_managed_identities_connection.h
deleted file mode 100644
index 067518b2eb13d..0000000000000
--- a/google/cloud/managedidentities/mocks/mock_managed_identities_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/managedidentities/v1/managed_identities_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MOCKS_MOCK_MANAGED_IDENTITIES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MOCKS_MOCK_MANAGED_IDENTITIES_CONNECTION_H
-
-#include "google/cloud/managedidentities/managed_identities_connection.h"
-#include "google/cloud/managedidentities/v1/mocks/mock_managed_identities_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in managedidentities_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace managedidentities_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// managedidentities_v1_mocks::MockManagedIdentitiesServiceConnection directly.
-using ::google::cloud::managedidentities_v1_mocks::
-    MockManagedIdentitiesServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace managedidentities_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MANAGEDIDENTITIES_MOCKS_MOCK_MANAGED_IDENTITIES_CONNECTION_H
diff --git a/google/cloud/memcache/BUILD.bazel b/google/cloud/memcache/BUILD.bazel
index 0c1545cb30b90..95f8992d458c4 100644
--- a/google/cloud/memcache/BUILD.bazel
+++ b/google/cloud/memcache/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/memcache/CMakeLists.txt b/google/cloud/memcache/CMakeLists.txt
index 3b379b93b6f30..8bec4ce9305af 100644
--- a/google/cloud/memcache/CMakeLists.txt
+++ b/google/cloud/memcache/CMakeLists.txt
@@ -17,8 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
-    memcache "Cloud Memorystore for Memcached API" SERVICE_DIRS "__EMPTY__"
-                                                                "v1/")
+    memcache "Cloud Memorystore for Memcached API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(memcache_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/memcache/cloud_memcache_client.h b/google/cloud/memcache/cloud_memcache_client.h
deleted file mode 100644
index 228b05b549d2e..0000000000000
--- a/google/cloud/memcache/cloud_memcache_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/memcache/v1/cloud_memcache.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_CLIENT_H
-
-#include "google/cloud/memcache/cloud_memcache_connection.h"
-#include "google/cloud/memcache/v1/cloud_memcache_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in memcache_v1 instead of the aliases defined in
-///     this namespace.
-namespace memcache {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use memcache_v1::CloudMemcacheClient directly.
-using ::google::cloud::memcache_v1::CloudMemcacheClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace memcache
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_CLIENT_H
diff --git a/google/cloud/memcache/cloud_memcache_connection.h b/google/cloud/memcache/cloud_memcache_connection.h
deleted file mode 100644
index f3c0708c5d05c..0000000000000
--- a/google/cloud/memcache/cloud_memcache_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/memcache/v1/cloud_memcache.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_CONNECTION_H
-
-#include "google/cloud/memcache/cloud_memcache_connection_idempotency_policy.h"
-#include "google/cloud/memcache/v1/cloud_memcache_connection.h"
-
-namespace google {
-namespace cloud {
-namespace memcache {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use memcache_v1::MakeCloudMemcacheConnection directly.
-using ::google::cloud::memcache_v1::MakeCloudMemcacheConnection;
-
-/// @deprecated Use memcache_v1::CloudMemcacheConnection directly.
-using ::google::cloud::memcache_v1::CloudMemcacheConnection;
-
-/// @deprecated Use memcache_v1::CloudMemcacheLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::memcache_v1::CloudMemcacheLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use memcache_v1::CloudMemcacheLimitedTimeRetryPolicy directly.
-using ::google::cloud::memcache_v1::CloudMemcacheLimitedTimeRetryPolicy;
-
-/// @deprecated Use memcache_v1::CloudMemcacheRetryPolicy directly.
-using ::google::cloud::memcache_v1::CloudMemcacheRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace memcache
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_CONNECTION_H
diff --git a/google/cloud/memcache/cloud_memcache_connection_idempotency_policy.h b/google/cloud/memcache/cloud_memcache_connection_idempotency_policy.h
deleted file mode 100644
index 7f1b603a89c4c..0000000000000
--- a/google/cloud/memcache/cloud_memcache_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/memcache/v1/cloud_memcache.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/memcache/v1/cloud_memcache_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace memcache {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// memcache_v1::MakeDefaultCloudMemcacheConnectionIdempotencyPolicy directly.
-using ::google::cloud::memcache_v1::
-    MakeDefaultCloudMemcacheConnectionIdempotencyPolicy;
-
-/// @deprecated Use memcache_v1::CloudMemcacheConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::memcache_v1::CloudMemcacheConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace memcache
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/memcache/cloud_memcache_options.h b/google/cloud/memcache/cloud_memcache_options.h
deleted file mode 100644
index 12b9a77399c70..0000000000000
--- a/google/cloud/memcache/cloud_memcache_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/memcache/v1/cloud_memcache.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_OPTIONS_H
-
-#include "google/cloud/memcache/cloud_memcache_connection.h"
-#include "google/cloud/memcache/cloud_memcache_connection_idempotency_policy.h"
-#include "google/cloud/memcache/v1/cloud_memcache_options.h"
-
-namespace google {
-namespace cloud {
-namespace memcache {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use memcache_v1::CloudMemcachePollingPolicyOption directly.
-using ::google::cloud::memcache_v1::CloudMemcachePollingPolicyOption;
-
-/// @deprecated Use memcache_v1::CloudMemcacheBackoffPolicyOption directly.
-using ::google::cloud::memcache_v1::CloudMemcacheBackoffPolicyOption;
-
-/// @deprecated Use memcache_v1::CloudMemcacheConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::memcache_v1::
-    CloudMemcacheConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use memcache_v1::CloudMemcachePolicyOptionList directly.
-using ::google::cloud::memcache_v1::CloudMemcachePolicyOptionList;
-
-/// @deprecated Use memcache_v1::CloudMemcacheRetryPolicyOption directly.
-using ::google::cloud::memcache_v1::CloudMemcacheRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace memcache
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_CLOUD_MEMCACHE_OPTIONS_H
diff --git a/google/cloud/memcache/mocks/mock_cloud_memcache_connection.h b/google/cloud/memcache/mocks/mock_cloud_memcache_connection.h
deleted file mode 100644
index 45dec651cbd0f..0000000000000
--- a/google/cloud/memcache/mocks/mock_cloud_memcache_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/memcache/v1/cloud_memcache.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_MOCKS_MOCK_CLOUD_MEMCACHE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_MOCKS_MOCK_CLOUD_MEMCACHE_CONNECTION_H
-
-#include "google/cloud/memcache/cloud_memcache_connection.h"
-#include "google/cloud/memcache/v1/mocks/mock_cloud_memcache_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in memcache_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace memcache_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use memcache_v1_mocks::MockCloudMemcacheConnection directly.
-using ::google::cloud::memcache_v1_mocks::MockCloudMemcacheConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace memcache_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MEMCACHE_MOCKS_MOCK_CLOUD_MEMCACHE_CONNECTION_H
diff --git a/google/cloud/monitoring/BUILD.bazel b/google/cloud/monitoring/BUILD.bazel
index 23a679b994a47..0aa3b290aac76 100644
--- a/google/cloud/monitoring/BUILD.bazel
+++ b/google/cloud/monitoring/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "dashboard/v1/",
     "metricsscope/v1/",
     "v3/",
diff --git a/google/cloud/monitoring/CMakeLists.txt b/google/cloud/monitoring/CMakeLists.txt
index 85f3112f92a85..ad37c05c43c3d 100644
--- a/google/cloud/monitoring/CMakeLists.txt
+++ b/google/cloud/monitoring/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
-    monitoring "Cloud Monitoring API" SERVICE_DIRS "__EMPTY__" "dashboard/v1/"
+    monitoring "Cloud Monitoring API" SERVICE_DIRS "dashboard/v1/"
                                                    "metricsscope/v1/" "v3/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
diff --git a/google/cloud/monitoring/alert_policy_client.h b/google/cloud/monitoring/alert_policy_client.h
deleted file mode 100644
index 5bc4cc7b700f0..0000000000000
--- a/google/cloud/monitoring/alert_policy_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/alert_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_CLIENT_H
-
-#include "google/cloud/monitoring/alert_policy_connection.h"
-#include "google/cloud/monitoring/v3/alert_policy_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3 instead of the aliases defined in
-///     this namespace.
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::AlertPolicyServiceClient directly.
-using ::google::cloud::monitoring_v3::AlertPolicyServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_CLIENT_H
diff --git a/google/cloud/monitoring/alert_policy_connection.h b/google/cloud/monitoring/alert_policy_connection.h
deleted file mode 100644
index 80bfafd7a945a..0000000000000
--- a/google/cloud/monitoring/alert_policy_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/alert_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_CONNECTION_H
-
-#include "google/cloud/monitoring/alert_policy_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/alert_policy_connection.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::MakeAlertPolicyServiceConnection directly.
-using ::google::cloud::monitoring_v3::MakeAlertPolicyServiceConnection;
-
-/// @deprecated Use monitoring_v3::AlertPolicyServiceConnection directly.
-using ::google::cloud::monitoring_v3::AlertPolicyServiceConnection;
-
-/// @deprecated Use
-/// monitoring_v3::AlertPolicyServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::monitoring_v3::
-    AlertPolicyServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use monitoring_v3::AlertPolicyServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::AlertPolicyServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use monitoring_v3::AlertPolicyServiceRetryPolicy directly.
-using ::google::cloud::monitoring_v3::AlertPolicyServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_CONNECTION_H
diff --git a/google/cloud/monitoring/alert_policy_connection_idempotency_policy.h b/google/cloud/monitoring/alert_policy_connection_idempotency_policy.h
deleted file mode 100644
index 988923b2d98d4..0000000000000
--- a/google/cloud/monitoring/alert_policy_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/alert_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/monitoring/v3/alert_policy_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_v3::MakeDefaultAlertPolicyServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::
-    MakeDefaultAlertPolicyServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use monitoring_v3::AlertPolicyServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::
-    AlertPolicyServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/monitoring/alert_policy_options.h b/google/cloud/monitoring/alert_policy_options.h
deleted file mode 100644
index 011cb8d43c404..0000000000000
--- a/google/cloud/monitoring/alert_policy_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/alert_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_OPTIONS_H
-
-#include "google/cloud/monitoring/alert_policy_connection.h"
-#include "google/cloud/monitoring/alert_policy_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/alert_policy_options.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::AlertPolicyServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::AlertPolicyServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// monitoring_v3::AlertPolicyServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::monitoring_v3::
-    AlertPolicyServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use monitoring_v3::AlertPolicyServicePolicyOptionList directly.
-using ::google::cloud::monitoring_v3::AlertPolicyServicePolicyOptionList;
-
-/// @deprecated Use monitoring_v3::AlertPolicyServiceRetryPolicyOption directly.
-using ::google::cloud::monitoring_v3::AlertPolicyServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_ALERT_POLICY_OPTIONS_H
diff --git a/google/cloud/monitoring/dashboards_client.h b/google/cloud/monitoring/dashboards_client.h
deleted file mode 100644
index c79d27a3c36b3..0000000000000
--- a/google/cloud/monitoring/dashboards_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/dashboard/v1/dashboards_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_CLIENT_H
-
-#include "google/cloud/monitoring/dashboard/v1/dashboards_client.h"
-#include "google/cloud/monitoring/dashboards_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_dashboard_v1 instead of the aliases defined
-///     in this namespace.
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_dashboard_v1::DashboardsServiceClient directly.
-using ::google::cloud::monitoring_dashboard_v1::DashboardsServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_CLIENT_H
diff --git a/google/cloud/monitoring/dashboards_connection.h b/google/cloud/monitoring/dashboards_connection.h
deleted file mode 100644
index 10a03bc195942..0000000000000
--- a/google/cloud/monitoring/dashboards_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/dashboard/v1/dashboards_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_CONNECTION_H
-
-#include "google/cloud/monitoring/dashboard/v1/dashboards_connection.h"
-#include "google/cloud/monitoring/dashboards_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_dashboard_v1::MakeDashboardsServiceConnection
-/// directly.
-using ::google::cloud::monitoring_dashboard_v1::MakeDashboardsServiceConnection;
-
-/// @deprecated Use monitoring_dashboard_v1::DashboardsServiceConnection
-/// directly.
-using ::google::cloud::monitoring_dashboard_v1::DashboardsServiceConnection;
-
-/// @deprecated Use
-/// monitoring_dashboard_v1::DashboardsServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_dashboard_v1::
-    DashboardsServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// monitoring_dashboard_v1::DashboardsServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::monitoring_dashboard_v1::
-    DashboardsServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use monitoring_dashboard_v1::DashboardsServiceRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_dashboard_v1::DashboardsServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_CONNECTION_H
diff --git a/google/cloud/monitoring/dashboards_connection_idempotency_policy.h b/google/cloud/monitoring/dashboards_connection_idempotency_policy.h
deleted file mode 100644
index d7db9219e013e..0000000000000
--- a/google/cloud/monitoring/dashboards_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/dashboard/v1/dashboards_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/monitoring/dashboard/v1/dashboards_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_dashboard_v1::MakeDefaultDashboardsServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_dashboard_v1::
-    MakeDefaultDashboardsServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// monitoring_dashboard_v1::DashboardsServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_dashboard_v1::
-    DashboardsServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/monitoring/dashboards_options.h b/google/cloud/monitoring/dashboards_options.h
deleted file mode 100644
index d47f5a9ff89e8..0000000000000
--- a/google/cloud/monitoring/dashboards_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/dashboard/v1/dashboards_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_OPTIONS_H
-
-#include "google/cloud/monitoring/dashboard/v1/dashboards_options.h"
-#include "google/cloud/monitoring/dashboards_connection.h"
-#include "google/cloud/monitoring/dashboards_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_dashboard_v1::DashboardsServiceBackoffPolicyOption directly.
-using ::google::cloud::monitoring_dashboard_v1::
-    DashboardsServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// monitoring_dashboard_v1::DashboardsServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::monitoring_dashboard_v1::
-    DashboardsServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use monitoring_dashboard_v1::DashboardsServicePolicyOptionList
-/// directly.
-using ::google::cloud::monitoring_dashboard_v1::
-    DashboardsServicePolicyOptionList;
-
-/// @deprecated Use monitoring_dashboard_v1::DashboardsServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::monitoring_dashboard_v1::
-    DashboardsServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_DASHBOARDS_OPTIONS_H
diff --git a/google/cloud/monitoring/group_client.h b/google/cloud/monitoring/group_client.h
deleted file mode 100644
index b9e326b868dfa..0000000000000
--- a/google/cloud/monitoring/group_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/group_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_CLIENT_H
-
-#include "google/cloud/monitoring/group_connection.h"
-#include "google/cloud/monitoring/v3/group_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3 instead of the aliases defined in
-///     this namespace.
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::GroupServiceClient directly.
-using ::google::cloud::monitoring_v3::GroupServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_CLIENT_H
diff --git a/google/cloud/monitoring/group_connection.h b/google/cloud/monitoring/group_connection.h
deleted file mode 100644
index 0745db4e7668b..0000000000000
--- a/google/cloud/monitoring/group_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/group_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_CONNECTION_H
-
-#include "google/cloud/monitoring/group_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/group_connection.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::MakeGroupServiceConnection directly.
-using ::google::cloud::monitoring_v3::MakeGroupServiceConnection;
-
-/// @deprecated Use monitoring_v3::GroupServiceConnection directly.
-using ::google::cloud::monitoring_v3::GroupServiceConnection;
-
-/// @deprecated Use monitoring_v3::GroupServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::GroupServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use monitoring_v3::GroupServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::monitoring_v3::GroupServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use monitoring_v3::GroupServiceRetryPolicy directly.
-using ::google::cloud::monitoring_v3::GroupServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_CONNECTION_H
diff --git a/google/cloud/monitoring/group_connection_idempotency_policy.h b/google/cloud/monitoring/group_connection_idempotency_policy.h
deleted file mode 100644
index 1c200addfa27c..0000000000000
--- a/google/cloud/monitoring/group_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/group_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/monitoring/v3/group_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_v3::MakeDefaultGroupServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::monitoring_v3::
-    MakeDefaultGroupServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use monitoring_v3::GroupServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::GroupServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/monitoring/group_options.h b/google/cloud/monitoring/group_options.h
deleted file mode 100644
index 01c2543d8a0d4..0000000000000
--- a/google/cloud/monitoring/group_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/group_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_OPTIONS_H
-
-#include "google/cloud/monitoring/group_connection.h"
-#include "google/cloud/monitoring/group_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/group_options.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::GroupServiceBackoffPolicyOption directly.
-using ::google::cloud::monitoring_v3::GroupServiceBackoffPolicyOption;
-
-/// @deprecated Use monitoring_v3::GroupServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::
-    GroupServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use monitoring_v3::GroupServicePolicyOptionList directly.
-using ::google::cloud::monitoring_v3::GroupServicePolicyOptionList;
-
-/// @deprecated Use monitoring_v3::GroupServiceRetryPolicyOption directly.
-using ::google::cloud::monitoring_v3::GroupServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_GROUP_OPTIONS_H
diff --git a/google/cloud/monitoring/metric_client.h b/google/cloud/monitoring/metric_client.h
deleted file mode 100644
index 4217c27f0d372..0000000000000
--- a/google/cloud/monitoring/metric_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/metric_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_CLIENT_H
-
-#include "google/cloud/monitoring/metric_connection.h"
-#include "google/cloud/monitoring/v3/metric_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3 instead of the aliases defined in
-///     this namespace.
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::MetricServiceClient directly.
-using ::google::cloud::monitoring_v3::MetricServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_CLIENT_H
diff --git a/google/cloud/monitoring/metric_connection.h b/google/cloud/monitoring/metric_connection.h
deleted file mode 100644
index 09afb1905be9a..0000000000000
--- a/google/cloud/monitoring/metric_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/metric_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_CONNECTION_H
-
-#include "google/cloud/monitoring/metric_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/metric_connection.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::MakeMetricServiceConnection directly.
-using ::google::cloud::monitoring_v3::MakeMetricServiceConnection;
-
-/// @deprecated Use monitoring_v3::MetricServiceConnection directly.
-using ::google::cloud::monitoring_v3::MetricServiceConnection;
-
-/// @deprecated Use monitoring_v3::MetricServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::MetricServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use monitoring_v3::MetricServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::monitoring_v3::MetricServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use monitoring_v3::MetricServiceRetryPolicy directly.
-using ::google::cloud::monitoring_v3::MetricServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_CONNECTION_H
diff --git a/google/cloud/monitoring/metric_connection_idempotency_policy.h b/google/cloud/monitoring/metric_connection_idempotency_policy.h
deleted file mode 100644
index 9c8d6664ad981..0000000000000
--- a/google/cloud/monitoring/metric_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/metric_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/monitoring/v3/metric_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_v3::MakeDefaultMetricServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::monitoring_v3::
-    MakeDefaultMetricServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use monitoring_v3::MetricServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::MetricServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/monitoring/metric_options.h b/google/cloud/monitoring/metric_options.h
deleted file mode 100644
index 8931e36cf17d8..0000000000000
--- a/google/cloud/monitoring/metric_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/metric_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_OPTIONS_H
-
-#include "google/cloud/monitoring/metric_connection.h"
-#include "google/cloud/monitoring/metric_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/metric_options.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::MetricServiceBackoffPolicyOption directly.
-using ::google::cloud::monitoring_v3::MetricServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// monitoring_v3::MetricServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::monitoring_v3::
-    MetricServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use monitoring_v3::MetricServicePolicyOptionList directly.
-using ::google::cloud::monitoring_v3::MetricServicePolicyOptionList;
-
-/// @deprecated Use monitoring_v3::MetricServiceRetryPolicyOption directly.
-using ::google::cloud::monitoring_v3::MetricServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRIC_OPTIONS_H
diff --git a/google/cloud/monitoring/metrics_scopes_client.h b/google/cloud/monitoring/metrics_scopes_client.h
deleted file mode 100644
index 06bb7e1890b00..0000000000000
--- a/google/cloud/monitoring/metrics_scopes_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/metricsscope/v1/metrics_scopes.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_CLIENT_H
-
-#include "google/cloud/monitoring/metrics_scopes_connection.h"
-#include "google/cloud/monitoring/metricsscope/v1/metrics_scopes_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_metricsscope_v1 instead of the aliases
-///     defined in this namespace.
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_metricsscope_v1::MetricsScopesClient directly.
-using ::google::cloud::monitoring_metricsscope_v1::MetricsScopesClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_CLIENT_H
diff --git a/google/cloud/monitoring/metrics_scopes_connection.h b/google/cloud/monitoring/metrics_scopes_connection.h
deleted file mode 100644
index 59c4aa67c17b8..0000000000000
--- a/google/cloud/monitoring/metrics_scopes_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/metricsscope/v1/metrics_scopes.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_CONNECTION_H
-
-#include "google/cloud/monitoring/metrics_scopes_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_metricsscope_v1::MakeMetricsScopesConnection
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::MakeMetricsScopesConnection;
-
-/// @deprecated Use monitoring_metricsscope_v1::MetricsScopesConnection
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::MetricsScopesConnection;
-
-/// @deprecated Use
-/// monitoring_metricsscope_v1::MetricsScopesLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::
-    MetricsScopesLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// monitoring_metricsscope_v1::MetricsScopesLimitedTimeRetryPolicy directly.
-using ::google::cloud::monitoring_metricsscope_v1::
-    MetricsScopesLimitedTimeRetryPolicy;
-
-/// @deprecated Use monitoring_metricsscope_v1::MetricsScopesRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::MetricsScopesRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_CONNECTION_H
diff --git a/google/cloud/monitoring/metrics_scopes_connection_idempotency_policy.h b/google/cloud/monitoring/metrics_scopes_connection_idempotency_policy.h
deleted file mode 100644
index 6dc2c5954b5c9..0000000000000
--- a/google/cloud/monitoring/metrics_scopes_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/metricsscope/v1/metrics_scopes.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/monitoring/metricsscope/v1/metrics_scopes_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_metricsscope_v1::MakeDefaultMetricsScopesConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::
-    MakeDefaultMetricsScopesConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// monitoring_metricsscope_v1::MetricsScopesConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::
-    MetricsScopesConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/monitoring/metrics_scopes_options.h b/google/cloud/monitoring/metrics_scopes_options.h
deleted file mode 100644
index 07936ae6e59cb..0000000000000
--- a/google/cloud/monitoring/metrics_scopes_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/metricsscope/v1/metrics_scopes.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_OPTIONS_H
-
-#include "google/cloud/monitoring/metrics_scopes_connection.h"
-#include "google/cloud/monitoring/metrics_scopes_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/metricsscope/v1/metrics_scopes_options.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_metricsscope_v1::MetricsScopesPollingPolicyOption
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::
-    MetricsScopesPollingPolicyOption;
-
-/// @deprecated Use monitoring_metricsscope_v1::MetricsScopesBackoffPolicyOption
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::
-    MetricsScopesBackoffPolicyOption;
-
-/// @deprecated Use
-/// monitoring_metricsscope_v1::MetricsScopesConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::
-    MetricsScopesConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use monitoring_metricsscope_v1::MetricsScopesPolicyOptionList
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::
-    MetricsScopesPolicyOptionList;
-
-/// @deprecated Use monitoring_metricsscope_v1::MetricsScopesRetryPolicyOption
-/// directly.
-using ::google::cloud::monitoring_metricsscope_v1::
-    MetricsScopesRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_METRICS_SCOPES_OPTIONS_H
diff --git a/google/cloud/monitoring/mocks/mock_alert_policy_connection.h b/google/cloud/monitoring/mocks/mock_alert_policy_connection.h
deleted file mode 100644
index a12a35ca1844e..0000000000000
--- a/google/cloud/monitoring/mocks/mock_alert_policy_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/alert_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_ALERT_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_ALERT_POLICY_CONNECTION_H
-
-#include "google/cloud/monitoring/alert_policy_connection.h"
-#include "google/cloud/monitoring/v3/mocks/mock_alert_policy_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace monitoring_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3_mocks::MockAlertPolicyServiceConnection
-/// directly.
-using ::google::cloud::monitoring_v3_mocks::MockAlertPolicyServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_ALERT_POLICY_CONNECTION_H
diff --git a/google/cloud/monitoring/mocks/mock_dashboards_connection.h b/google/cloud/monitoring/mocks/mock_dashboards_connection.h
deleted file mode 100644
index f189034518b4d..0000000000000
--- a/google/cloud/monitoring/mocks/mock_dashboards_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/dashboard/v1/dashboards_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_DASHBOARDS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_DASHBOARDS_CONNECTION_H
-
-#include "google/cloud/monitoring/dashboard/v1/mocks/mock_dashboards_connection.h"
-#include "google/cloud/monitoring/dashboards_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_dashboard_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace monitoring_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_dashboard_v1_mocks::MockDashboardsServiceConnection directly.
-using ::google::cloud::monitoring_dashboard_v1_mocks::
-    MockDashboardsServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_DASHBOARDS_CONNECTION_H
diff --git a/google/cloud/monitoring/mocks/mock_group_connection.h b/google/cloud/monitoring/mocks/mock_group_connection.h
deleted file mode 100644
index 70095b1974f81..0000000000000
--- a/google/cloud/monitoring/mocks/mock_group_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/group_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_GROUP_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_GROUP_CONNECTION_H
-
-#include "google/cloud/monitoring/group_connection.h"
-#include "google/cloud/monitoring/v3/mocks/mock_group_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace monitoring_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3_mocks::MockGroupServiceConnection directly.
-using ::google::cloud::monitoring_v3_mocks::MockGroupServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_GROUP_CONNECTION_H
diff --git a/google/cloud/monitoring/mocks/mock_metric_connection.h b/google/cloud/monitoring/mocks/mock_metric_connection.h
deleted file mode 100644
index ea9d87ab549e1..0000000000000
--- a/google/cloud/monitoring/mocks/mock_metric_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/metric_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_METRIC_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_METRIC_CONNECTION_H
-
-#include "google/cloud/monitoring/metric_connection.h"
-#include "google/cloud/monitoring/v3/mocks/mock_metric_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace monitoring_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3_mocks::MockMetricServiceConnection directly.
-using ::google::cloud::monitoring_v3_mocks::MockMetricServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_METRIC_CONNECTION_H
diff --git a/google/cloud/monitoring/mocks/mock_metrics_scopes_connection.h b/google/cloud/monitoring/mocks/mock_metrics_scopes_connection.h
deleted file mode 100644
index 9bd7bf4120393..0000000000000
--- a/google/cloud/monitoring/mocks/mock_metrics_scopes_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/metricsscope/v1/metrics_scopes.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_METRICS_SCOPES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_METRICS_SCOPES_CONNECTION_H
-
-#include "google/cloud/monitoring/metrics_scopes_connection.h"
-#include "google/cloud/monitoring/metricsscope/v1/mocks/mock_metrics_scopes_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_metricsscope_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace monitoring_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_metricsscope_v1_mocks::MockMetricsScopesConnection directly.
-using ::google::cloud::monitoring_metricsscope_v1_mocks::
-    MockMetricsScopesConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_METRICS_SCOPES_CONNECTION_H
diff --git a/google/cloud/monitoring/mocks/mock_notification_channel_connection.h b/google/cloud/monitoring/mocks/mock_notification_channel_connection.h
deleted file mode 100644
index 0e89780c9f939..0000000000000
--- a/google/cloud/monitoring/mocks/mock_notification_channel_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/notification_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_NOTIFICATION_CHANNEL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_NOTIFICATION_CHANNEL_CONNECTION_H
-
-#include "google/cloud/monitoring/notification_channel_connection.h"
-#include "google/cloud/monitoring/v3/mocks/mock_notification_channel_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace monitoring_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_v3_mocks::MockNotificationChannelServiceConnection directly.
-using ::google::cloud::monitoring_v3_mocks::
-    MockNotificationChannelServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_NOTIFICATION_CHANNEL_CONNECTION_H
diff --git a/google/cloud/monitoring/mocks/mock_query_connection.h b/google/cloud/monitoring/mocks/mock_query_connection.h
deleted file mode 100644
index 55d353fa95d1f..0000000000000
--- a/google/cloud/monitoring/mocks/mock_query_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/query_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_QUERY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_QUERY_CONNECTION_H
-
-#include "google/cloud/monitoring/query_connection.h"
-#include "google/cloud/monitoring/v3/mocks/mock_query_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace monitoring_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3_mocks::MockQueryServiceConnection directly.
-using ::google::cloud::monitoring_v3_mocks::MockQueryServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_QUERY_CONNECTION_H
diff --git a/google/cloud/monitoring/mocks/mock_service_monitoring_connection.h b/google/cloud/monitoring/mocks/mock_service_monitoring_connection.h
deleted file mode 100644
index 3bb25eb55321b..0000000000000
--- a/google/cloud/monitoring/mocks/mock_service_monitoring_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/service_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_SERVICE_MONITORING_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_SERVICE_MONITORING_CONNECTION_H
-
-#include "google/cloud/monitoring/service_monitoring_connection.h"
-#include "google/cloud/monitoring/v3/mocks/mock_service_monitoring_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace monitoring_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3_mocks::MockServiceMonitoringServiceConnection
-/// directly.
-using ::google::cloud::monitoring_v3_mocks::
-    MockServiceMonitoringServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_SERVICE_MONITORING_CONNECTION_H
diff --git a/google/cloud/monitoring/mocks/mock_uptime_check_connection.h b/google/cloud/monitoring/mocks/mock_uptime_check_connection.h
deleted file mode 100644
index bacad030a968a..0000000000000
--- a/google/cloud/monitoring/mocks/mock_uptime_check_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/uptime_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_UPTIME_CHECK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_UPTIME_CHECK_CONNECTION_H
-
-#include "google/cloud/monitoring/uptime_check_connection.h"
-#include "google/cloud/monitoring/v3/mocks/mock_uptime_check_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace monitoring_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3_mocks::MockUptimeCheckServiceConnection
-/// directly.
-using ::google::cloud::monitoring_v3_mocks::MockUptimeCheckServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_MOCKS_MOCK_UPTIME_CHECK_CONNECTION_H
diff --git a/google/cloud/monitoring/notification_channel_client.h b/google/cloud/monitoring/notification_channel_client.h
deleted file mode 100644
index 10bb972cf9748..0000000000000
--- a/google/cloud/monitoring/notification_channel_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/notification_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_CLIENT_H
-
-#include "google/cloud/monitoring/notification_channel_connection.h"
-#include "google/cloud/monitoring/v3/notification_channel_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3 instead of the aliases defined in
-///     this namespace.
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::NotificationChannelServiceClient directly.
-using ::google::cloud::monitoring_v3::NotificationChannelServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_CLIENT_H
diff --git a/google/cloud/monitoring/notification_channel_connection.h b/google/cloud/monitoring/notification_channel_connection.h
deleted file mode 100644
index 7342a37707a0e..0000000000000
--- a/google/cloud/monitoring/notification_channel_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/notification_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_CONNECTION_H
-
-#include "google/cloud/monitoring/notification_channel_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/notification_channel_connection.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::MakeNotificationChannelServiceConnection
-/// directly.
-using ::google::cloud::monitoring_v3::MakeNotificationChannelServiceConnection;
-
-/// @deprecated Use monitoring_v3::NotificationChannelServiceConnection
-/// directly.
-using ::google::cloud::monitoring_v3::NotificationChannelServiceConnection;
-
-/// @deprecated Use
-/// monitoring_v3::NotificationChannelServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::
-    NotificationChannelServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// monitoring_v3::NotificationChannelServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::monitoring_v3::
-    NotificationChannelServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use monitoring_v3::NotificationChannelServiceRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::NotificationChannelServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_CONNECTION_H
diff --git a/google/cloud/monitoring/notification_channel_connection_idempotency_policy.h b/google/cloud/monitoring/notification_channel_connection_idempotency_policy.h
deleted file mode 100644
index ed43ac0c213fb..0000000000000
--- a/google/cloud/monitoring/notification_channel_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/notification_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/monitoring/v3/notification_channel_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_v3::MakeDefaultNotificationChannelServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::
-    MakeDefaultNotificationChannelServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// monitoring_v3::NotificationChannelServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::
-    NotificationChannelServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/monitoring/notification_channel_options.h b/google/cloud/monitoring/notification_channel_options.h
deleted file mode 100644
index 93659b17a03a5..0000000000000
--- a/google/cloud/monitoring/notification_channel_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/notification_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_OPTIONS_H
-
-#include "google/cloud/monitoring/notification_channel_connection.h"
-#include "google/cloud/monitoring/notification_channel_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/notification_channel_options.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::NotificationChannelServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::
-    NotificationChannelServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// monitoring_v3::NotificationChannelServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::
-    NotificationChannelServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use monitoring_v3::NotificationChannelServicePolicyOptionList
-/// directly.
-using ::google::cloud::monitoring_v3::
-    NotificationChannelServicePolicyOptionList;
-
-/// @deprecated Use monitoring_v3::NotificationChannelServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::
-    NotificationChannelServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_NOTIFICATION_CHANNEL_OPTIONS_H
diff --git a/google/cloud/monitoring/query_client.h b/google/cloud/monitoring/query_client.h
deleted file mode 100644
index ad5c84801a048..0000000000000
--- a/google/cloud/monitoring/query_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/query_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_CLIENT_H
-
-#include "google/cloud/monitoring/query_connection.h"
-#include "google/cloud/monitoring/v3/query_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3 instead of the aliases defined in
-///     this namespace.
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::QueryServiceClient directly.
-using ::google::cloud::monitoring_v3::QueryServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_CLIENT_H
diff --git a/google/cloud/monitoring/query_connection.h b/google/cloud/monitoring/query_connection.h
deleted file mode 100644
index 30edf28300eb3..0000000000000
--- a/google/cloud/monitoring/query_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/query_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_CONNECTION_H
-
-#include "google/cloud/monitoring/query_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/query_connection.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::MakeQueryServiceConnection directly.
-using ::google::cloud::monitoring_v3::MakeQueryServiceConnection;
-
-/// @deprecated Use monitoring_v3::QueryServiceConnection directly.
-using ::google::cloud::monitoring_v3::QueryServiceConnection;
-
-/// @deprecated Use monitoring_v3::QueryServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::QueryServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use monitoring_v3::QueryServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::monitoring_v3::QueryServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use monitoring_v3::QueryServiceRetryPolicy directly.
-using ::google::cloud::monitoring_v3::QueryServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_CONNECTION_H
diff --git a/google/cloud/monitoring/query_connection_idempotency_policy.h b/google/cloud/monitoring/query_connection_idempotency_policy.h
deleted file mode 100644
index 34464b5f07c64..0000000000000
--- a/google/cloud/monitoring/query_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/query_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/monitoring/v3/query_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_v3::MakeDefaultQueryServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::monitoring_v3::
-    MakeDefaultQueryServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use monitoring_v3::QueryServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::QueryServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/monitoring/query_options.h b/google/cloud/monitoring/query_options.h
deleted file mode 100644
index 0e4039d535d98..0000000000000
--- a/google/cloud/monitoring/query_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/query_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_OPTIONS_H
-
-#include "google/cloud/monitoring/query_connection.h"
-#include "google/cloud/monitoring/query_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/query_options.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::QueryServiceBackoffPolicyOption directly.
-using ::google::cloud::monitoring_v3::QueryServiceBackoffPolicyOption;
-
-/// @deprecated Use monitoring_v3::QueryServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::
-    QueryServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use monitoring_v3::QueryServicePolicyOptionList directly.
-using ::google::cloud::monitoring_v3::QueryServicePolicyOptionList;
-
-/// @deprecated Use monitoring_v3::QueryServiceRetryPolicyOption directly.
-using ::google::cloud::monitoring_v3::QueryServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_QUERY_OPTIONS_H
diff --git a/google/cloud/monitoring/service_monitoring_client.h b/google/cloud/monitoring/service_monitoring_client.h
deleted file mode 100644
index 483fd0e0f1661..0000000000000
--- a/google/cloud/monitoring/service_monitoring_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/service_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_CLIENT_H
-
-#include "google/cloud/monitoring/service_monitoring_connection.h"
-#include "google/cloud/monitoring/v3/service_monitoring_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3 instead of the aliases defined in
-///     this namespace.
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::ServiceMonitoringServiceClient directly.
-using ::google::cloud::monitoring_v3::ServiceMonitoringServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_CLIENT_H
diff --git a/google/cloud/monitoring/service_monitoring_connection.h b/google/cloud/monitoring/service_monitoring_connection.h
deleted file mode 100644
index 0687d4fc765c9..0000000000000
--- a/google/cloud/monitoring/service_monitoring_connection.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/service_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_CONNECTION_H
-
-#include "google/cloud/monitoring/service_monitoring_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/service_monitoring_connection.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::MakeServiceMonitoringServiceConnection
-/// directly.
-using ::google::cloud::monitoring_v3::MakeServiceMonitoringServiceConnection;
-
-/// @deprecated Use monitoring_v3::ServiceMonitoringServiceConnection directly.
-using ::google::cloud::monitoring_v3::ServiceMonitoringServiceConnection;
-
-/// @deprecated Use
-/// monitoring_v3::ServiceMonitoringServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::
-    ServiceMonitoringServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// monitoring_v3::ServiceMonitoringServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::monitoring_v3::
-    ServiceMonitoringServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use monitoring_v3::ServiceMonitoringServiceRetryPolicy directly.
-using ::google::cloud::monitoring_v3::ServiceMonitoringServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_CONNECTION_H
diff --git a/google/cloud/monitoring/service_monitoring_connection_idempotency_policy.h b/google/cloud/monitoring/service_monitoring_connection_idempotency_policy.h
deleted file mode 100644
index a58aa159edb1a..0000000000000
--- a/google/cloud/monitoring/service_monitoring_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/service_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/monitoring/v3/service_monitoring_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_v3::MakeDefaultServiceMonitoringServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::
-    MakeDefaultServiceMonitoringServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// monitoring_v3::ServiceMonitoringServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::monitoring_v3::
-    ServiceMonitoringServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/monitoring/service_monitoring_options.h b/google/cloud/monitoring/service_monitoring_options.h
deleted file mode 100644
index 8bc13aa670702..0000000000000
--- a/google/cloud/monitoring/service_monitoring_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/service_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_OPTIONS_H
-
-#include "google/cloud/monitoring/service_monitoring_connection.h"
-#include "google/cloud/monitoring/service_monitoring_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/service_monitoring_options.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::ServiceMonitoringServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::
-    ServiceMonitoringServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// monitoring_v3::ServiceMonitoringServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::
-    ServiceMonitoringServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use monitoring_v3::ServiceMonitoringServicePolicyOptionList
-/// directly.
-using ::google::cloud::monitoring_v3::ServiceMonitoringServicePolicyOptionList;
-
-/// @deprecated Use monitoring_v3::ServiceMonitoringServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::ServiceMonitoringServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_SERVICE_MONITORING_OPTIONS_H
diff --git a/google/cloud/monitoring/uptime_check_client.h b/google/cloud/monitoring/uptime_check_client.h
deleted file mode 100644
index 80ac18bee1404..0000000000000
--- a/google/cloud/monitoring/uptime_check_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/uptime_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_CLIENT_H
-
-#include "google/cloud/monitoring/uptime_check_connection.h"
-#include "google/cloud/monitoring/v3/uptime_check_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in monitoring_v3 instead of the aliases defined in
-///     this namespace.
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::UptimeCheckServiceClient directly.
-using ::google::cloud::monitoring_v3::UptimeCheckServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_CLIENT_H
diff --git a/google/cloud/monitoring/uptime_check_connection.h b/google/cloud/monitoring/uptime_check_connection.h
deleted file mode 100644
index 3b7e7326b6e71..0000000000000
--- a/google/cloud/monitoring/uptime_check_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/uptime_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_CONNECTION_H
-
-#include "google/cloud/monitoring/uptime_check_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/uptime_check_connection.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::MakeUptimeCheckServiceConnection directly.
-using ::google::cloud::monitoring_v3::MakeUptimeCheckServiceConnection;
-
-/// @deprecated Use monitoring_v3::UptimeCheckServiceConnection directly.
-using ::google::cloud::monitoring_v3::UptimeCheckServiceConnection;
-
-/// @deprecated Use
-/// monitoring_v3::UptimeCheckServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::monitoring_v3::
-    UptimeCheckServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use monitoring_v3::UptimeCheckServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::UptimeCheckServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use monitoring_v3::UptimeCheckServiceRetryPolicy directly.
-using ::google::cloud::monitoring_v3::UptimeCheckServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_CONNECTION_H
diff --git a/google/cloud/monitoring/uptime_check_connection_idempotency_policy.h b/google/cloud/monitoring/uptime_check_connection_idempotency_policy.h
deleted file mode 100644
index a0a23b1297e14..0000000000000
--- a/google/cloud/monitoring/uptime_check_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/uptime_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/monitoring/v3/uptime_check_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// monitoring_v3::MakeDefaultUptimeCheckServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::
-    MakeDefaultUptimeCheckServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use monitoring_v3::UptimeCheckServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::monitoring_v3::
-    UptimeCheckServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/monitoring/uptime_check_options.h b/google/cloud/monitoring/uptime_check_options.h
deleted file mode 100644
index 2cd0bfab6507c..0000000000000
--- a/google/cloud/monitoring/uptime_check_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/monitoring/v3/uptime_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_OPTIONS_H
-
-#include "google/cloud/monitoring/uptime_check_connection.h"
-#include "google/cloud/monitoring/uptime_check_connection_idempotency_policy.h"
-#include "google/cloud/monitoring/v3/uptime_check_options.h"
-
-namespace google {
-namespace cloud {
-namespace monitoring {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use monitoring_v3::UptimeCheckServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::monitoring_v3::UptimeCheckServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// monitoring_v3::UptimeCheckServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::monitoring_v3::
-    UptimeCheckServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use monitoring_v3::UptimeCheckServicePolicyOptionList directly.
-using ::google::cloud::monitoring_v3::UptimeCheckServicePolicyOptionList;
-
-/// @deprecated Use monitoring_v3::UptimeCheckServiceRetryPolicyOption directly.
-using ::google::cloud::monitoring_v3::UptimeCheckServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace monitoring
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MONITORING_UPTIME_CHECK_OPTIONS_H
diff --git a/google/cloud/networkconnectivity/BUILD.bazel b/google/cloud/networkconnectivity/BUILD.bazel
index cad27b8b526f3..2c5e0932cf876 100644
--- a/google/cloud/networkconnectivity/BUILD.bazel
+++ b/google/cloud/networkconnectivity/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/networkconnectivity/CMakeLists.txt b/google/cloud/networkconnectivity/CMakeLists.txt
index 27b71c2ca8640..025c214fc5804 100644
--- a/google/cloud/networkconnectivity/CMakeLists.txt
+++ b/google/cloud/networkconnectivity/CMakeLists.txt
@@ -17,8 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
-    networkconnectivity "Network Connectivity API" SERVICE_DIRS "__EMPTY__"
-                                                                "v1/")
+    networkconnectivity "Network Connectivity API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(networkconnectivity_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/networkconnectivity/hub_client.h b/google/cloud/networkconnectivity/hub_client.h
deleted file mode 100644
index 93325fc71ddf2..0000000000000
--- a/google/cloud/networkconnectivity/hub_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkconnectivity/v1/hub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_CLIENT_H
-
-#include "google/cloud/networkconnectivity/hub_connection.h"
-#include "google/cloud/networkconnectivity/v1/hub_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in networkconnectivity_v1 instead of the aliases defined
-///     in this namespace.
-namespace networkconnectivity {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use networkconnectivity_v1::HubServiceClient directly.
-using ::google::cloud::networkconnectivity_v1::HubServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkconnectivity
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_CLIENT_H
diff --git a/google/cloud/networkconnectivity/hub_connection.h b/google/cloud/networkconnectivity/hub_connection.h
deleted file mode 100644
index ae1b4a9c0d504..0000000000000
--- a/google/cloud/networkconnectivity/hub_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkconnectivity/v1/hub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_CONNECTION_H
-
-#include "google/cloud/networkconnectivity/hub_connection_idempotency_policy.h"
-#include "google/cloud/networkconnectivity/v1/hub_connection.h"
-
-namespace google {
-namespace cloud {
-namespace networkconnectivity {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use networkconnectivity_v1::MakeHubServiceConnection directly.
-using ::google::cloud::networkconnectivity_v1::MakeHubServiceConnection;
-
-/// @deprecated Use networkconnectivity_v1::HubServiceConnection directly.
-using ::google::cloud::networkconnectivity_v1::HubServiceConnection;
-
-/// @deprecated Use
-/// networkconnectivity_v1::HubServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::networkconnectivity_v1::
-    HubServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use networkconnectivity_v1::HubServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::networkconnectivity_v1::HubServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use networkconnectivity_v1::HubServiceRetryPolicy directly.
-using ::google::cloud::networkconnectivity_v1::HubServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkconnectivity
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_CONNECTION_H
diff --git a/google/cloud/networkconnectivity/hub_connection_idempotency_policy.h b/google/cloud/networkconnectivity/hub_connection_idempotency_policy.h
deleted file mode 100644
index 6acb7f3f82dde..0000000000000
--- a/google/cloud/networkconnectivity/hub_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkconnectivity/v1/hub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/networkconnectivity/v1/hub_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace networkconnectivity {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// networkconnectivity_v1::MakeDefaultHubServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::networkconnectivity_v1::
-    MakeDefaultHubServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// networkconnectivity_v1::HubServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::networkconnectivity_v1::
-    HubServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkconnectivity
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/networkconnectivity/hub_options.h b/google/cloud/networkconnectivity/hub_options.h
deleted file mode 100644
index 28fc557125867..0000000000000
--- a/google/cloud/networkconnectivity/hub_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkconnectivity/v1/hub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_OPTIONS_H
-
-#include "google/cloud/networkconnectivity/hub_connection.h"
-#include "google/cloud/networkconnectivity/hub_connection_idempotency_policy.h"
-#include "google/cloud/networkconnectivity/v1/hub_options.h"
-
-namespace google {
-namespace cloud {
-namespace networkconnectivity {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use networkconnectivity_v1::HubServicePollingPolicyOption
-/// directly.
-using ::google::cloud::networkconnectivity_v1::HubServicePollingPolicyOption;
-
-/// @deprecated Use networkconnectivity_v1::HubServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::networkconnectivity_v1::HubServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// networkconnectivity_v1::HubServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::networkconnectivity_v1::
-    HubServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use networkconnectivity_v1::HubServicePolicyOptionList directly.
-using ::google::cloud::networkconnectivity_v1::HubServicePolicyOptionList;
-
-/// @deprecated Use networkconnectivity_v1::HubServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::networkconnectivity_v1::HubServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkconnectivity
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_HUB_OPTIONS_H
diff --git a/google/cloud/networkconnectivity/mocks/mock_hub_connection.h b/google/cloud/networkconnectivity/mocks/mock_hub_connection.h
deleted file mode 100644
index c4375b4e8c9e4..0000000000000
--- a/google/cloud/networkconnectivity/mocks/mock_hub_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkconnectivity/v1/hub.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_MOCKS_MOCK_HUB_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_MOCKS_MOCK_HUB_CONNECTION_H
-
-#include "google/cloud/networkconnectivity/hub_connection.h"
-#include "google/cloud/networkconnectivity/v1/mocks/mock_hub_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in networkconnectivity_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace networkconnectivity_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use networkconnectivity_v1_mocks::MockHubServiceConnection
-/// directly.
-using ::google::cloud::networkconnectivity_v1_mocks::MockHubServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkconnectivity_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKCONNECTIVITY_MOCKS_MOCK_HUB_CONNECTION_H
diff --git a/google/cloud/networkmanagement/BUILD.bazel b/google/cloud/networkmanagement/BUILD.bazel
index 4b9ca74409458..0a9996080fe66 100644
--- a/google/cloud/networkmanagement/BUILD.bazel
+++ b/google/cloud/networkmanagement/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/networkmanagement/CMakeLists.txt b/google/cloud/networkmanagement/CMakeLists.txt
index 16d513b0fc47b..90b9c8a1e2d81 100644
--- a/google/cloud/networkmanagement/CMakeLists.txt
+++ b/google/cloud/networkmanagement/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(networkmanagement "Network Management API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(networkmanagement_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/networkmanagement/mocks/mock_reachability_connection.h b/google/cloud/networkmanagement/mocks/mock_reachability_connection.h
deleted file mode 100644
index b277c8b3d6d11..0000000000000
--- a/google/cloud/networkmanagement/mocks/mock_reachability_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkmanagement/v1/reachability.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_MOCKS_MOCK_REACHABILITY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_MOCKS_MOCK_REACHABILITY_CONNECTION_H
-
-#include "google/cloud/networkmanagement/reachability_connection.h"
-#include "google/cloud/networkmanagement/v1/mocks/mock_reachability_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in networkmanagement_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace networkmanagement_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// networkmanagement_v1_mocks::MockReachabilityServiceConnection directly.
-using ::google::cloud::networkmanagement_v1_mocks::
-    MockReachabilityServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkmanagement_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_MOCKS_MOCK_REACHABILITY_CONNECTION_H
diff --git a/google/cloud/networkmanagement/reachability_client.h b/google/cloud/networkmanagement/reachability_client.h
deleted file mode 100644
index d0056562fe6a2..0000000000000
--- a/google/cloud/networkmanagement/reachability_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkmanagement/v1/reachability.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_CLIENT_H
-
-#include "google/cloud/networkmanagement/reachability_connection.h"
-#include "google/cloud/networkmanagement/v1/reachability_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in networkmanagement_v1 instead of the aliases defined in
-///     this namespace.
-namespace networkmanagement {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use networkmanagement_v1::ReachabilityServiceClient directly.
-using ::google::cloud::networkmanagement_v1::ReachabilityServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkmanagement
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_CLIENT_H
diff --git a/google/cloud/networkmanagement/reachability_connection.h b/google/cloud/networkmanagement/reachability_connection.h
deleted file mode 100644
index d38f49ab346c4..0000000000000
--- a/google/cloud/networkmanagement/reachability_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkmanagement/v1/reachability.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_CONNECTION_H
-
-#include "google/cloud/networkmanagement/reachability_connection_idempotency_policy.h"
-#include "google/cloud/networkmanagement/v1/reachability_connection.h"
-
-namespace google {
-namespace cloud {
-namespace networkmanagement {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use networkmanagement_v1::MakeReachabilityServiceConnection
-/// directly.
-using ::google::cloud::networkmanagement_v1::MakeReachabilityServiceConnection;
-
-/// @deprecated Use networkmanagement_v1::ReachabilityServiceConnection
-/// directly.
-using ::google::cloud::networkmanagement_v1::ReachabilityServiceConnection;
-
-/// @deprecated Use
-/// networkmanagement_v1::ReachabilityServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::networkmanagement_v1::
-    ReachabilityServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// networkmanagement_v1::ReachabilityServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::networkmanagement_v1::
-    ReachabilityServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use networkmanagement_v1::ReachabilityServiceRetryPolicy
-/// directly.
-using ::google::cloud::networkmanagement_v1::ReachabilityServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkmanagement
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_CONNECTION_H
diff --git a/google/cloud/networkmanagement/reachability_connection_idempotency_policy.h b/google/cloud/networkmanagement/reachability_connection_idempotency_policy.h
deleted file mode 100644
index da62b6810e34e..0000000000000
--- a/google/cloud/networkmanagement/reachability_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkmanagement/v1/reachability.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/networkmanagement/v1/reachability_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace networkmanagement {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// networkmanagement_v1::MakeDefaultReachabilityServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::networkmanagement_v1::
-    MakeDefaultReachabilityServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// networkmanagement_v1::ReachabilityServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::networkmanagement_v1::
-    ReachabilityServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkmanagement
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/networkmanagement/reachability_options.h b/google/cloud/networkmanagement/reachability_options.h
deleted file mode 100644
index d772fb1bdfb6b..0000000000000
--- a/google/cloud/networkmanagement/reachability_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/networkmanagement/v1/reachability.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_OPTIONS_H
-
-#include "google/cloud/networkmanagement/reachability_connection.h"
-#include "google/cloud/networkmanagement/reachability_connection_idempotency_policy.h"
-#include "google/cloud/networkmanagement/v1/reachability_options.h"
-
-namespace google {
-namespace cloud {
-namespace networkmanagement {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use networkmanagement_v1::ReachabilityServicePollingPolicyOption
-/// directly.
-using ::google::cloud::networkmanagement_v1::
-    ReachabilityServicePollingPolicyOption;
-
-/// @deprecated Use networkmanagement_v1::ReachabilityServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::networkmanagement_v1::
-    ReachabilityServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// networkmanagement_v1::ReachabilityServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::networkmanagement_v1::
-    ReachabilityServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use networkmanagement_v1::ReachabilityServicePolicyOptionList
-/// directly.
-using ::google::cloud::networkmanagement_v1::
-    ReachabilityServicePolicyOptionList;
-
-/// @deprecated Use networkmanagement_v1::ReachabilityServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::networkmanagement_v1::
-    ReachabilityServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace networkmanagement
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NETWORKMANAGEMENT_REACHABILITY_OPTIONS_H
diff --git a/google/cloud/notebooks/BUILD.bazel b/google/cloud/notebooks/BUILD.bazel
index 8a3032e1a8afc..7febd682d260b 100644
--- a/google/cloud/notebooks/BUILD.bazel
+++ b/google/cloud/notebooks/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "v2/",
 ]
diff --git a/google/cloud/notebooks/CMakeLists.txt b/google/cloud/notebooks/CMakeLists.txt
index f657aaf5f65c2..eb47354bdc5bc 100644
--- a/google/cloud/notebooks/CMakeLists.txt
+++ b/google/cloud/notebooks/CMakeLists.txt
@@ -16,8 +16,8 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(notebooks "Notebooks API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/" "v2/")
+google_cloud_cpp_add_gapic_library(notebooks "Notebooks API" SERVICE_DIRS "v1/"
+                                                                          "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(notebooks_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/notebooks/managed_notebook_client.h b/google/cloud/notebooks/managed_notebook_client.h
deleted file mode 100644
index bbddc64b0cd9e..0000000000000
--- a/google/cloud/notebooks/managed_notebook_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/managed_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_CLIENT_H
-
-#include "google/cloud/notebooks/managed_notebook_connection.h"
-#include "google/cloud/notebooks/v1/managed_notebook_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in notebooks_v1 instead of the aliases defined in
-///     this namespace.
-namespace notebooks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use notebooks_v1::ManagedNotebookServiceClient directly.
-using ::google::cloud::notebooks_v1::ManagedNotebookServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_CLIENT_H
diff --git a/google/cloud/notebooks/managed_notebook_connection.h b/google/cloud/notebooks/managed_notebook_connection.h
deleted file mode 100644
index c38d788004627..0000000000000
--- a/google/cloud/notebooks/managed_notebook_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/managed_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_CONNECTION_H
-
-#include "google/cloud/notebooks/managed_notebook_connection_idempotency_policy.h"
-#include "google/cloud/notebooks/v1/managed_notebook_connection.h"
-
-namespace google {
-namespace cloud {
-namespace notebooks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use notebooks_v1::MakeManagedNotebookServiceConnection directly.
-using ::google::cloud::notebooks_v1::MakeManagedNotebookServiceConnection;
-
-/// @deprecated Use notebooks_v1::ManagedNotebookServiceConnection directly.
-using ::google::cloud::notebooks_v1::ManagedNotebookServiceConnection;
-
-/// @deprecated Use
-/// notebooks_v1::ManagedNotebookServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::notebooks_v1::
-    ManagedNotebookServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use notebooks_v1::ManagedNotebookServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::notebooks_v1::
-    ManagedNotebookServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use notebooks_v1::ManagedNotebookServiceRetryPolicy directly.
-using ::google::cloud::notebooks_v1::ManagedNotebookServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_CONNECTION_H
diff --git a/google/cloud/notebooks/managed_notebook_connection_idempotency_policy.h b/google/cloud/notebooks/managed_notebook_connection_idempotency_policy.h
deleted file mode 100644
index 55618141907e9..0000000000000
--- a/google/cloud/notebooks/managed_notebook_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/managed_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/notebooks/v1/managed_notebook_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace notebooks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// notebooks_v1::MakeDefaultManagedNotebookServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::notebooks_v1::
-    MakeDefaultManagedNotebookServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// notebooks_v1::ManagedNotebookServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::notebooks_v1::
-    ManagedNotebookServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/notebooks/managed_notebook_options.h b/google/cloud/notebooks/managed_notebook_options.h
deleted file mode 100644
index 5acd37f6df28f..0000000000000
--- a/google/cloud/notebooks/managed_notebook_options.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/managed_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_OPTIONS_H
-
-#include "google/cloud/notebooks/managed_notebook_connection.h"
-#include "google/cloud/notebooks/managed_notebook_connection_idempotency_policy.h"
-#include "google/cloud/notebooks/v1/managed_notebook_options.h"
-
-namespace google {
-namespace cloud {
-namespace notebooks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use notebooks_v1::ManagedNotebookServicePollingPolicyOption
-/// directly.
-using ::google::cloud::notebooks_v1::ManagedNotebookServicePollingPolicyOption;
-
-/// @deprecated Use notebooks_v1::ManagedNotebookServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::notebooks_v1::ManagedNotebookServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// notebooks_v1::ManagedNotebookServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::notebooks_v1::
-    ManagedNotebookServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use notebooks_v1::ManagedNotebookServicePolicyOptionList
-/// directly.
-using ::google::cloud::notebooks_v1::ManagedNotebookServicePolicyOptionList;
-
-/// @deprecated Use notebooks_v1::ManagedNotebookServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::notebooks_v1::ManagedNotebookServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MANAGED_NOTEBOOK_OPTIONS_H
diff --git a/google/cloud/notebooks/mocks/mock_managed_notebook_connection.h b/google/cloud/notebooks/mocks/mock_managed_notebook_connection.h
deleted file mode 100644
index 552aa0075c970..0000000000000
--- a/google/cloud/notebooks/mocks/mock_managed_notebook_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/managed_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MOCKS_MOCK_MANAGED_NOTEBOOK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MOCKS_MOCK_MANAGED_NOTEBOOK_CONNECTION_H
-
-#include "google/cloud/notebooks/managed_notebook_connection.h"
-#include "google/cloud/notebooks/v1/mocks/mock_managed_notebook_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in notebooks_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace notebooks_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use notebooks_v1_mocks::MockManagedNotebookServiceConnection
-/// directly.
-using ::google::cloud::notebooks_v1_mocks::MockManagedNotebookServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MOCKS_MOCK_MANAGED_NOTEBOOK_CONNECTION_H
diff --git a/google/cloud/notebooks/mocks/mock_notebook_connection.h b/google/cloud/notebooks/mocks/mock_notebook_connection.h
deleted file mode 100644
index fad3765db1981..0000000000000
--- a/google/cloud/notebooks/mocks/mock_notebook_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MOCKS_MOCK_NOTEBOOK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MOCKS_MOCK_NOTEBOOK_CONNECTION_H
-
-#include "google/cloud/notebooks/notebook_connection.h"
-#include "google/cloud/notebooks/v1/mocks/mock_notebook_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in notebooks_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace notebooks_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use notebooks_v1_mocks::MockNotebookServiceConnection directly.
-using ::google::cloud::notebooks_v1_mocks::MockNotebookServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_MOCKS_MOCK_NOTEBOOK_CONNECTION_H
diff --git a/google/cloud/notebooks/notebook_client.h b/google/cloud/notebooks/notebook_client.h
deleted file mode 100644
index 920b20f87f608..0000000000000
--- a/google/cloud/notebooks/notebook_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_CLIENT_H
-
-#include "google/cloud/notebooks/notebook_connection.h"
-#include "google/cloud/notebooks/v1/notebook_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in notebooks_v1 instead of the aliases defined in
-///     this namespace.
-namespace notebooks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use notebooks_v1::NotebookServiceClient directly.
-using ::google::cloud::notebooks_v1::NotebookServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_CLIENT_H
diff --git a/google/cloud/notebooks/notebook_connection.h b/google/cloud/notebooks/notebook_connection.h
deleted file mode 100644
index d3ea3c268ae79..0000000000000
--- a/google/cloud/notebooks/notebook_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_CONNECTION_H
-
-#include "google/cloud/notebooks/notebook_connection_idempotency_policy.h"
-#include "google/cloud/notebooks/v1/notebook_connection.h"
-
-namespace google {
-namespace cloud {
-namespace notebooks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use notebooks_v1::MakeNotebookServiceConnection directly.
-using ::google::cloud::notebooks_v1::MakeNotebookServiceConnection;
-
-/// @deprecated Use notebooks_v1::NotebookServiceConnection directly.
-using ::google::cloud::notebooks_v1::NotebookServiceConnection;
-
-/// @deprecated Use notebooks_v1::NotebookServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::notebooks_v1::
-    NotebookServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use notebooks_v1::NotebookServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::notebooks_v1::NotebookServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use notebooks_v1::NotebookServiceRetryPolicy directly.
-using ::google::cloud::notebooks_v1::NotebookServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_CONNECTION_H
diff --git a/google/cloud/notebooks/notebook_connection_idempotency_policy.h b/google/cloud/notebooks/notebook_connection_idempotency_policy.h
deleted file mode 100644
index 116f0c2654765..0000000000000
--- a/google/cloud/notebooks/notebook_connection_idempotency_policy.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/notebooks/v1/notebook_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace notebooks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// notebooks_v1::MakeDefaultNotebookServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::notebooks_v1::
-    MakeDefaultNotebookServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use notebooks_v1::NotebookServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::notebooks_v1::NotebookServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/notebooks/notebook_options.h b/google/cloud/notebooks/notebook_options.h
deleted file mode 100644
index 8e736eddcd4e4..0000000000000
--- a/google/cloud/notebooks/notebook_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/notebooks/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_OPTIONS_H
-
-#include "google/cloud/notebooks/notebook_connection.h"
-#include "google/cloud/notebooks/notebook_connection_idempotency_policy.h"
-#include "google/cloud/notebooks/v1/notebook_options.h"
-
-namespace google {
-namespace cloud {
-namespace notebooks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use notebooks_v1::NotebookServicePollingPolicyOption directly.
-using ::google::cloud::notebooks_v1::NotebookServicePollingPolicyOption;
-
-/// @deprecated Use notebooks_v1::NotebookServiceBackoffPolicyOption directly.
-using ::google::cloud::notebooks_v1::NotebookServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// notebooks_v1::NotebookServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::notebooks_v1::
-    NotebookServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use notebooks_v1::NotebookServicePolicyOptionList directly.
-using ::google::cloud::notebooks_v1::NotebookServicePolicyOptionList;
-
-/// @deprecated Use notebooks_v1::NotebookServiceRetryPolicyOption directly.
-using ::google::cloud::notebooks_v1::NotebookServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace notebooks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_NOTEBOOKS_NOTEBOOK_OPTIONS_H
diff --git a/google/cloud/optimization/BUILD.bazel b/google/cloud/optimization/BUILD.bazel
index 4f0cfaa51adae..1b0d2304b6300 100644
--- a/google/cloud/optimization/BUILD.bazel
+++ b/google/cloud/optimization/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/optimization/CMakeLists.txt b/google/cloud/optimization/CMakeLists.txt
index 8e312ebdc7708..c8212ae6fd0dd 100644
--- a/google/cloud/optimization/CMakeLists.txt
+++ b/google/cloud/optimization/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(optimization "Cloud Optimization API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(optimization_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/optimization/fleet_routing_client.h b/google/cloud/optimization/fleet_routing_client.h
deleted file mode 100644
index ca9c5042e3dd5..0000000000000
--- a/google/cloud/optimization/fleet_routing_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/optimization/v1/fleet_routing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_CLIENT_H
-
-#include "google/cloud/optimization/fleet_routing_connection.h"
-#include "google/cloud/optimization/v1/fleet_routing_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in optimization_v1 instead of the aliases defined in
-///     this namespace.
-namespace optimization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use optimization_v1::FleetRoutingClient directly.
-using ::google::cloud::optimization_v1::FleetRoutingClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace optimization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_CLIENT_H
diff --git a/google/cloud/optimization/fleet_routing_connection.h b/google/cloud/optimization/fleet_routing_connection.h
deleted file mode 100644
index 22648844eafc3..0000000000000
--- a/google/cloud/optimization/fleet_routing_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/optimization/v1/fleet_routing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_CONNECTION_H
-
-#include "google/cloud/optimization/fleet_routing_connection_idempotency_policy.h"
-#include "google/cloud/optimization/v1/fleet_routing_connection.h"
-
-namespace google {
-namespace cloud {
-namespace optimization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use optimization_v1::MakeFleetRoutingConnection directly.
-using ::google::cloud::optimization_v1::MakeFleetRoutingConnection;
-
-/// @deprecated Use optimization_v1::FleetRoutingConnection directly.
-using ::google::cloud::optimization_v1::FleetRoutingConnection;
-
-/// @deprecated Use optimization_v1::FleetRoutingLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::optimization_v1::
-    FleetRoutingLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use optimization_v1::FleetRoutingLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::optimization_v1::FleetRoutingLimitedTimeRetryPolicy;
-
-/// @deprecated Use optimization_v1::FleetRoutingRetryPolicy directly.
-using ::google::cloud::optimization_v1::FleetRoutingRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace optimization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_CONNECTION_H
diff --git a/google/cloud/optimization/fleet_routing_connection_idempotency_policy.h b/google/cloud/optimization/fleet_routing_connection_idempotency_policy.h
deleted file mode 100644
index e9c1a1c16fcae..0000000000000
--- a/google/cloud/optimization/fleet_routing_connection_idempotency_policy.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/optimization/v1/fleet_routing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/optimization/v1/fleet_routing_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace optimization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// optimization_v1::MakeDefaultFleetRoutingConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::optimization_v1::
-    MakeDefaultFleetRoutingConnectionIdempotencyPolicy;
-
-/// @deprecated Use optimization_v1::FleetRoutingConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::optimization_v1::FleetRoutingConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace optimization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/optimization/fleet_routing_options.h b/google/cloud/optimization/fleet_routing_options.h
deleted file mode 100644
index c57e5706232bc..0000000000000
--- a/google/cloud/optimization/fleet_routing_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/optimization/v1/fleet_routing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_OPTIONS_H
-
-#include "google/cloud/optimization/fleet_routing_connection.h"
-#include "google/cloud/optimization/fleet_routing_connection_idempotency_policy.h"
-#include "google/cloud/optimization/v1/fleet_routing_options.h"
-
-namespace google {
-namespace cloud {
-namespace optimization {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use optimization_v1::FleetRoutingPollingPolicyOption directly.
-using ::google::cloud::optimization_v1::FleetRoutingPollingPolicyOption;
-
-/// @deprecated Use optimization_v1::FleetRoutingBackoffPolicyOption directly.
-using ::google::cloud::optimization_v1::FleetRoutingBackoffPolicyOption;
-
-/// @deprecated Use
-/// optimization_v1::FleetRoutingConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::optimization_v1::
-    FleetRoutingConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use optimization_v1::FleetRoutingPolicyOptionList directly.
-using ::google::cloud::optimization_v1::FleetRoutingPolicyOptionList;
-
-/// @deprecated Use optimization_v1::FleetRoutingRetryPolicyOption directly.
-using ::google::cloud::optimization_v1::FleetRoutingRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace optimization
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_FLEET_ROUTING_OPTIONS_H
diff --git a/google/cloud/optimization/mocks/mock_fleet_routing_connection.h b/google/cloud/optimization/mocks/mock_fleet_routing_connection.h
deleted file mode 100644
index 7fb7014de7369..0000000000000
--- a/google/cloud/optimization/mocks/mock_fleet_routing_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/optimization/v1/fleet_routing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_MOCKS_MOCK_FLEET_ROUTING_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_MOCKS_MOCK_FLEET_ROUTING_CONNECTION_H
-
-#include "google/cloud/optimization/fleet_routing_connection.h"
-#include "google/cloud/optimization/v1/mocks/mock_fleet_routing_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in optimization_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace optimization_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use optimization_v1_mocks::MockFleetRoutingConnection directly.
-using ::google::cloud::optimization_v1_mocks::MockFleetRoutingConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace optimization_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OPTIMIZATION_MOCKS_MOCK_FLEET_ROUTING_CONNECTION_H
diff --git a/google/cloud/orgpolicy/BUILD.bazel b/google/cloud/orgpolicy/BUILD.bazel
index bb5923f1629d9..fec89ac3d3e0e 100644
--- a/google/cloud/orgpolicy/BUILD.bazel
+++ b/google/cloud/orgpolicy/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v2/",
 ]
 
diff --git a/google/cloud/orgpolicy/CMakeLists.txt b/google/cloud/orgpolicy/CMakeLists.txt
index 5e05ffac807f2..170d71c53a863 100644
--- a/google/cloud/orgpolicy/CMakeLists.txt
+++ b/google/cloud/orgpolicy/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(orgpolicy "Organization Policy API"
-                                   SERVICE_DIRS "__EMPTY__" "v2/")
+                                   SERVICE_DIRS "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(orgpolicy_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/orgpolicy/mocks/mock_org_policy_connection.h b/google/cloud/orgpolicy/mocks/mock_org_policy_connection.h
deleted file mode 100644
index 3db3988f946b9..0000000000000
--- a/google/cloud/orgpolicy/mocks/mock_org_policy_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orgpolicy/v2/orgpolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_MOCKS_MOCK_ORG_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_MOCKS_MOCK_ORG_POLICY_CONNECTION_H
-
-#include "google/cloud/orgpolicy/org_policy_connection.h"
-#include "google/cloud/orgpolicy/v2/mocks/mock_org_policy_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in orgpolicy_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace orgpolicy_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use orgpolicy_v2_mocks::MockOrgPolicyConnection directly.
-using ::google::cloud::orgpolicy_v2_mocks::MockOrgPolicyConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace orgpolicy_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_MOCKS_MOCK_ORG_POLICY_CONNECTION_H
diff --git a/google/cloud/orgpolicy/org_policy_client.h b/google/cloud/orgpolicy/org_policy_client.h
deleted file mode 100644
index 0fd05a8b2bba6..0000000000000
--- a/google/cloud/orgpolicy/org_policy_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orgpolicy/v2/orgpolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_CLIENT_H
-
-#include "google/cloud/orgpolicy/org_policy_connection.h"
-#include "google/cloud/orgpolicy/v2/org_policy_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in orgpolicy_v2 instead of the aliases defined in
-///     this namespace.
-namespace orgpolicy {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyClient directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace orgpolicy
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_CLIENT_H
diff --git a/google/cloud/orgpolicy/org_policy_connection.h b/google/cloud/orgpolicy/org_policy_connection.h
deleted file mode 100644
index d44f5fb92354b..0000000000000
--- a/google/cloud/orgpolicy/org_policy_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orgpolicy/v2/orgpolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_CONNECTION_H
-
-#include "google/cloud/orgpolicy/org_policy_connection_idempotency_policy.h"
-#include "google/cloud/orgpolicy/v2/org_policy_connection.h"
-
-namespace google {
-namespace cloud {
-namespace orgpolicy {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use orgpolicy_v2::MakeOrgPolicyConnection directly.
-using ::google::cloud::orgpolicy_v2::MakeOrgPolicyConnection;
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyConnection directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyConnection;
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyLimitedTimeRetryPolicy directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyLimitedTimeRetryPolicy;
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyRetryPolicy directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace orgpolicy
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_CONNECTION_H
diff --git a/google/cloud/orgpolicy/org_policy_connection_idempotency_policy.h b/google/cloud/orgpolicy/org_policy_connection_idempotency_policy.h
deleted file mode 100644
index 34bfda72eef23..0000000000000
--- a/google/cloud/orgpolicy/org_policy_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orgpolicy/v2/orgpolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/orgpolicy/v2/org_policy_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace orgpolicy {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// orgpolicy_v2::MakeDefaultOrgPolicyConnectionIdempotencyPolicy directly.
-using ::google::cloud::orgpolicy_v2::
-    MakeDefaultOrgPolicyConnectionIdempotencyPolicy;
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyConnectionIdempotencyPolicy directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace orgpolicy
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/orgpolicy/org_policy_options.h b/google/cloud/orgpolicy/org_policy_options.h
deleted file mode 100644
index b70d98abd5aea..0000000000000
--- a/google/cloud/orgpolicy/org_policy_options.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/orgpolicy/v2/orgpolicy.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_OPTIONS_H
-
-#include "google/cloud/orgpolicy/org_policy_connection.h"
-#include "google/cloud/orgpolicy/org_policy_connection_idempotency_policy.h"
-#include "google/cloud/orgpolicy/v2/org_policy_options.h"
-
-namespace google {
-namespace cloud {
-namespace orgpolicy {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyBackoffPolicyOption directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyBackoffPolicyOption;
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyPolicyOptionList directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyPolicyOptionList;
-
-/// @deprecated Use orgpolicy_v2::OrgPolicyRetryPolicyOption directly.
-using ::google::cloud::orgpolicy_v2::OrgPolicyRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace orgpolicy
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_ORGPOLICY_ORG_POLICY_OPTIONS_H
diff --git a/google/cloud/osconfig/BUILD.bazel b/google/cloud/osconfig/BUILD.bazel
index b98422aaa117b..44e1d5b1d60c9 100644
--- a/google/cloud/osconfig/BUILD.bazel
+++ b/google/cloud/osconfig/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "agentendpoint/v1/",
     "v1/",
 ]
diff --git a/google/cloud/osconfig/CMakeLists.txt b/google/cloud/osconfig/CMakeLists.txt
index 6f11a155a5114..b5a7ec0f9cfd6 100644
--- a/google/cloud/osconfig/CMakeLists.txt
+++ b/google/cloud/osconfig/CMakeLists.txt
@@ -16,8 +16,8 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(
-    osconfig "OS Config API" SERVICE_DIRS "__EMPTY__" "agentendpoint/v1/" "v1/")
+google_cloud_cpp_add_gapic_library(osconfig "OS Config API"
+                                   SERVICE_DIRS "agentendpoint/v1/" "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(osconfig_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/osconfig/agent_endpoint_client.h b/google/cloud/osconfig/agent_endpoint_client.h
deleted file mode 100644
index efd8033172aa9..0000000000000
--- a/google/cloud/osconfig/agent_endpoint_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_CLIENT_H
-
-#include "google/cloud/osconfig/agent_endpoint_connection.h"
-#include "google/cloud/osconfig/agentendpoint/v1/agent_endpoint_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in osconfig_agentendpoint_v1 instead of the aliases
-///     defined in this namespace.
-namespace osconfig {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use osconfig_agentendpoint_v1::AgentEndpointServiceClient
-/// directly.
-using ::google::cloud::osconfig_agentendpoint_v1::AgentEndpointServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_CLIENT_H
diff --git a/google/cloud/osconfig/agent_endpoint_connection.h b/google/cloud/osconfig/agent_endpoint_connection.h
deleted file mode 100644
index 94183d88a7a80..0000000000000
--- a/google/cloud/osconfig/agent_endpoint_connection.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_CONNECTION_H
-
-#include "google/cloud/osconfig/agent_endpoint_connection_idempotency_policy.h"
-#include "google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection.h"
-
-namespace google {
-namespace cloud {
-namespace osconfig {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1::MakeAgentEndpointServiceConnection directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    MakeAgentEndpointServiceConnection;
-
-/// @deprecated Use osconfig_agentendpoint_v1::AgentEndpointServiceConnection
-/// directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    AgentEndpointServiceConnection;
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1::AgentEndpointServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    AgentEndpointServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1::AgentEndpointServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    AgentEndpointServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use osconfig_agentendpoint_v1::AgentEndpointServiceRetryPolicy
-/// directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    AgentEndpointServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_CONNECTION_H
diff --git a/google/cloud/osconfig/agent_endpoint_connection_idempotency_policy.h b/google/cloud/osconfig/agent_endpoint_connection_idempotency_policy.h
deleted file mode 100644
index 7f3d0d4292b29..0000000000000
--- a/google/cloud/osconfig/agent_endpoint_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/osconfig/agentendpoint/v1/agent_endpoint_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace osconfig {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1::MakeDefaultAgentEndpointServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    MakeDefaultAgentEndpointServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1::AgentEndpointServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    AgentEndpointServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/osconfig/agent_endpoint_options.h b/google/cloud/osconfig/agent_endpoint_options.h
deleted file mode 100644
index 042ac65af658c..0000000000000
--- a/google/cloud/osconfig/agent_endpoint_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_OPTIONS_H
-
-#include "google/cloud/osconfig/agent_endpoint_connection.h"
-#include "google/cloud/osconfig/agent_endpoint_connection_idempotency_policy.h"
-#include "google/cloud/osconfig/agentendpoint/v1/agent_endpoint_options.h"
-
-namespace google {
-namespace cloud {
-namespace osconfig {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1::AgentEndpointServiceBackoffPolicyOption directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    AgentEndpointServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1::AgentEndpointServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    AgentEndpointServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1::AgentEndpointServicePolicyOptionList directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    AgentEndpointServicePolicyOptionList;
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1::AgentEndpointServiceRetryPolicyOption directly.
-using ::google::cloud::osconfig_agentendpoint_v1::
-    AgentEndpointServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_AGENT_ENDPOINT_OPTIONS_H
diff --git a/google/cloud/osconfig/mocks/mock_agent_endpoint_connection.h b/google/cloud/osconfig/mocks/mock_agent_endpoint_connection.h
deleted file mode 100644
index 5857d67310593..0000000000000
--- a/google/cloud/osconfig/mocks/mock_agent_endpoint_connection.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_MOCKS_MOCK_AGENT_ENDPOINT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_MOCKS_MOCK_AGENT_ENDPOINT_CONNECTION_H
-
-#include "google/cloud/osconfig/agent_endpoint_connection.h"
-#include "google/cloud/osconfig/agentendpoint/v1/mocks/mock_agent_endpoint_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in osconfig_agentendpoint_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace osconfig_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// osconfig_agentendpoint_v1_mocks::MockAgentEndpointServiceConnection
-/// directly.
-using ::google::cloud::osconfig_agentendpoint_v1_mocks::
-    MockAgentEndpointServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_MOCKS_MOCK_AGENT_ENDPOINT_CONNECTION_H
diff --git a/google/cloud/osconfig/mocks/mock_os_config_connection.h b/google/cloud/osconfig/mocks/mock_os_config_connection.h
deleted file mode 100644
index 787a20b03dde5..0000000000000
--- a/google/cloud/osconfig/mocks/mock_os_config_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/v1/osconfig_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_MOCKS_MOCK_OS_CONFIG_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_MOCKS_MOCK_OS_CONFIG_CONNECTION_H
-
-#include "google/cloud/osconfig/os_config_connection.h"
-#include "google/cloud/osconfig/v1/mocks/mock_os_config_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in osconfig_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace osconfig_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use osconfig_v1_mocks::MockOsConfigServiceConnection directly.
-using ::google::cloud::osconfig_v1_mocks::MockOsConfigServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_MOCKS_MOCK_OS_CONFIG_CONNECTION_H
diff --git a/google/cloud/osconfig/os_config_client.h b/google/cloud/osconfig/os_config_client.h
deleted file mode 100644
index 1ed7ff8388434..0000000000000
--- a/google/cloud/osconfig/os_config_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/v1/osconfig_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_CLIENT_H
-
-#include "google/cloud/osconfig/os_config_connection.h"
-#include "google/cloud/osconfig/v1/os_config_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in osconfig_v1 instead of the aliases defined in
-///     this namespace.
-namespace osconfig {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use osconfig_v1::OsConfigServiceClient directly.
-using ::google::cloud::osconfig_v1::OsConfigServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_CLIENT_H
diff --git a/google/cloud/osconfig/os_config_connection.h b/google/cloud/osconfig/os_config_connection.h
deleted file mode 100644
index 54ed6627f74e3..0000000000000
--- a/google/cloud/osconfig/os_config_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/v1/osconfig_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_CONNECTION_H
-
-#include "google/cloud/osconfig/os_config_connection_idempotency_policy.h"
-#include "google/cloud/osconfig/v1/os_config_connection.h"
-
-namespace google {
-namespace cloud {
-namespace osconfig {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use osconfig_v1::MakeOsConfigServiceConnection directly.
-using ::google::cloud::osconfig_v1::MakeOsConfigServiceConnection;
-
-/// @deprecated Use osconfig_v1::OsConfigServiceConnection directly.
-using ::google::cloud::osconfig_v1::OsConfigServiceConnection;
-
-/// @deprecated Use osconfig_v1::OsConfigServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::osconfig_v1::OsConfigServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use osconfig_v1::OsConfigServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::osconfig_v1::OsConfigServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use osconfig_v1::OsConfigServiceRetryPolicy directly.
-using ::google::cloud::osconfig_v1::OsConfigServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_CONNECTION_H
diff --git a/google/cloud/osconfig/os_config_connection_idempotency_policy.h b/google/cloud/osconfig/os_config_connection_idempotency_policy.h
deleted file mode 100644
index 00addb807efc9..0000000000000
--- a/google/cloud/osconfig/os_config_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/v1/osconfig_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/osconfig/v1/os_config_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace osconfig {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// osconfig_v1::MakeDefaultOsConfigServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::osconfig_v1::
-    MakeDefaultOsConfigServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use osconfig_v1::OsConfigServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::osconfig_v1::OsConfigServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/osconfig/os_config_options.h b/google/cloud/osconfig/os_config_options.h
deleted file mode 100644
index 1365ea86fdbf5..0000000000000
--- a/google/cloud/osconfig/os_config_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/osconfig/v1/osconfig_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_OPTIONS_H
-
-#include "google/cloud/osconfig/os_config_connection.h"
-#include "google/cloud/osconfig/os_config_connection_idempotency_policy.h"
-#include "google/cloud/osconfig/v1/os_config_options.h"
-
-namespace google {
-namespace cloud {
-namespace osconfig {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use osconfig_v1::OsConfigServiceBackoffPolicyOption directly.
-using ::google::cloud::osconfig_v1::OsConfigServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// osconfig_v1::OsConfigServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::osconfig_v1::
-    OsConfigServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use osconfig_v1::OsConfigServicePolicyOptionList directly.
-using ::google::cloud::osconfig_v1::OsConfigServicePolicyOptionList;
-
-/// @deprecated Use osconfig_v1::OsConfigServiceRetryPolicyOption directly.
-using ::google::cloud::osconfig_v1::OsConfigServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace osconfig
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSCONFIG_OS_CONFIG_OPTIONS_H
diff --git a/google/cloud/oslogin/BUILD.bazel b/google/cloud/oslogin/BUILD.bazel
index 39244a830b945..85f9ea1baa849 100644
--- a/google/cloud/oslogin/BUILD.bazel
+++ b/google/cloud/oslogin/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/oslogin/CMakeLists.txt b/google/cloud/oslogin/CMakeLists.txt
index db13a3013d920..1271d1d6b602f 100644
--- a/google/cloud/oslogin/CMakeLists.txt
+++ b/google/cloud/oslogin/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(oslogin "Cloud OS Login API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(oslogin_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/oslogin/mocks/mock_os_login_connection.h b/google/cloud/oslogin/mocks/mock_os_login_connection.h
deleted file mode 100644
index 6af7e32cb08aa..0000000000000
--- a/google/cloud/oslogin/mocks/mock_os_login_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/oslogin/v1/oslogin.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_MOCKS_MOCK_OS_LOGIN_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_MOCKS_MOCK_OS_LOGIN_CONNECTION_H
-
-#include "google/cloud/oslogin/os_login_connection.h"
-#include "google/cloud/oslogin/v1/mocks/mock_os_login_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in oslogin_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace oslogin_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use oslogin_v1_mocks::MockOsLoginServiceConnection directly.
-using ::google::cloud::oslogin_v1_mocks::MockOsLoginServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace oslogin_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_MOCKS_MOCK_OS_LOGIN_CONNECTION_H
diff --git a/google/cloud/oslogin/os_login_client.h b/google/cloud/oslogin/os_login_client.h
deleted file mode 100644
index 604e9435cfe0d..0000000000000
--- a/google/cloud/oslogin/os_login_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/oslogin/v1/oslogin.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_CLIENT_H
-
-#include "google/cloud/oslogin/os_login_connection.h"
-#include "google/cloud/oslogin/v1/os_login_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in oslogin_v1 instead of the aliases defined in
-///     this namespace.
-namespace oslogin {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use oslogin_v1::OsLoginServiceClient directly.
-using ::google::cloud::oslogin_v1::OsLoginServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace oslogin
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_CLIENT_H
diff --git a/google/cloud/oslogin/os_login_connection.h b/google/cloud/oslogin/os_login_connection.h
deleted file mode 100644
index 3f3357e521978..0000000000000
--- a/google/cloud/oslogin/os_login_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/oslogin/v1/oslogin.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_CONNECTION_H
-
-#include "google/cloud/oslogin/os_login_connection_idempotency_policy.h"
-#include "google/cloud/oslogin/v1/os_login_connection.h"
-
-namespace google {
-namespace cloud {
-namespace oslogin {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use oslogin_v1::MakeOsLoginServiceConnection directly.
-using ::google::cloud::oslogin_v1::MakeOsLoginServiceConnection;
-
-/// @deprecated Use oslogin_v1::OsLoginServiceConnection directly.
-using ::google::cloud::oslogin_v1::OsLoginServiceConnection;
-
-/// @deprecated Use oslogin_v1::OsLoginServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::oslogin_v1::OsLoginServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use oslogin_v1::OsLoginServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::oslogin_v1::OsLoginServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use oslogin_v1::OsLoginServiceRetryPolicy directly.
-using ::google::cloud::oslogin_v1::OsLoginServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace oslogin
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_CONNECTION_H
diff --git a/google/cloud/oslogin/os_login_connection_idempotency_policy.h b/google/cloud/oslogin/os_login_connection_idempotency_policy.h
deleted file mode 100644
index b7da81804504d..0000000000000
--- a/google/cloud/oslogin/os_login_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/oslogin/v1/oslogin.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/oslogin/v1/os_login_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace oslogin {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// oslogin_v1::MakeDefaultOsLoginServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::oslogin_v1::
-    MakeDefaultOsLoginServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use oslogin_v1::OsLoginServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::oslogin_v1::OsLoginServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace oslogin
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/oslogin/os_login_options.h b/google/cloud/oslogin/os_login_options.h
deleted file mode 100644
index 011618f74761a..0000000000000
--- a/google/cloud/oslogin/os_login_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/oslogin/v1/oslogin.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_OPTIONS_H
-
-#include "google/cloud/oslogin/os_login_connection.h"
-#include "google/cloud/oslogin/os_login_connection_idempotency_policy.h"
-#include "google/cloud/oslogin/v1/os_login_options.h"
-
-namespace google {
-namespace cloud {
-namespace oslogin {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use oslogin_v1::OsLoginServiceBackoffPolicyOption directly.
-using ::google::cloud::oslogin_v1::OsLoginServiceBackoffPolicyOption;
-
-/// @deprecated Use oslogin_v1::OsLoginServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::oslogin_v1::
-    OsLoginServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use oslogin_v1::OsLoginServicePolicyOptionList directly.
-using ::google::cloud::oslogin_v1::OsLoginServicePolicyOptionList;
-
-/// @deprecated Use oslogin_v1::OsLoginServiceRetryPolicyOption directly.
-using ::google::cloud::oslogin_v1::OsLoginServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace oslogin
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_OSLOGIN_OS_LOGIN_OPTIONS_H
diff --git a/google/cloud/policytroubleshooter/BUILD.bazel b/google/cloud/policytroubleshooter/BUILD.bazel
index 4b27b867d1063..2d917b74a37ec 100644
--- a/google/cloud/policytroubleshooter/BUILD.bazel
+++ b/google/cloud/policytroubleshooter/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "iam/v3/",
 ]
diff --git a/google/cloud/policytroubleshooter/CMakeLists.txt b/google/cloud/policytroubleshooter/CMakeLists.txt
index ed9c631ed7d2a..9dbbff484491e 100644
--- a/google/cloud/policytroubleshooter/CMakeLists.txt
+++ b/google/cloud/policytroubleshooter/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     policytroubleshooter "Policy Troubleshooter API"
-    SERVICE_DIRS "__EMPTY__" "v1/" "iam/v3/"
+    SERVICE_DIRS "v1/" "iam/v3/"
     SHARED_PROTO_DEPS "iam_v2")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
diff --git a/google/cloud/policytroubleshooter/iam_checker_client.h b/google/cloud/policytroubleshooter/iam_checker_client.h
deleted file mode 100644
index c6379cd9c0604..0000000000000
--- a/google/cloud/policytroubleshooter/iam_checker_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/policytroubleshooter/v1/checker.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_CLIENT_H
-
-#include "google/cloud/policytroubleshooter/iam_checker_connection.h"
-#include "google/cloud/policytroubleshooter/v1/iam_checker_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in policytroubleshooter_v1 instead of the aliases defined
-///     in this namespace.
-namespace policytroubleshooter {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use policytroubleshooter_v1::IamCheckerClient directly.
-using ::google::cloud::policytroubleshooter_v1::IamCheckerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace policytroubleshooter
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_CLIENT_H
diff --git a/google/cloud/policytroubleshooter/iam_checker_connection.h b/google/cloud/policytroubleshooter/iam_checker_connection.h
deleted file mode 100644
index 558f4d53aa5ac..0000000000000
--- a/google/cloud/policytroubleshooter/iam_checker_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/policytroubleshooter/v1/checker.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_CONNECTION_H
-
-#include "google/cloud/policytroubleshooter/iam_checker_connection_idempotency_policy.h"
-#include "google/cloud/policytroubleshooter/v1/iam_checker_connection.h"
-
-namespace google {
-namespace cloud {
-namespace policytroubleshooter {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use policytroubleshooter_v1::MakeIamCheckerConnection directly.
-using ::google::cloud::policytroubleshooter_v1::MakeIamCheckerConnection;
-
-/// @deprecated Use policytroubleshooter_v1::IamCheckerConnection directly.
-using ::google::cloud::policytroubleshooter_v1::IamCheckerConnection;
-
-/// @deprecated Use
-/// policytroubleshooter_v1::IamCheckerLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::policytroubleshooter_v1::
-    IamCheckerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use policytroubleshooter_v1::IamCheckerLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::policytroubleshooter_v1::
-    IamCheckerLimitedTimeRetryPolicy;
-
-/// @deprecated Use policytroubleshooter_v1::IamCheckerRetryPolicy directly.
-using ::google::cloud::policytroubleshooter_v1::IamCheckerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace policytroubleshooter
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_CONNECTION_H
diff --git a/google/cloud/policytroubleshooter/iam_checker_connection_idempotency_policy.h b/google/cloud/policytroubleshooter/iam_checker_connection_idempotency_policy.h
deleted file mode 100644
index 3441af2bc8e15..0000000000000
--- a/google/cloud/policytroubleshooter/iam_checker_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/policytroubleshooter/v1/checker.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/policytroubleshooter/v1/iam_checker_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace policytroubleshooter {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// policytroubleshooter_v1::MakeDefaultIamCheckerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::policytroubleshooter_v1::
-    MakeDefaultIamCheckerConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// policytroubleshooter_v1::IamCheckerConnectionIdempotencyPolicy directly.
-using ::google::cloud::policytroubleshooter_v1::
-    IamCheckerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace policytroubleshooter
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/policytroubleshooter/iam_checker_options.h b/google/cloud/policytroubleshooter/iam_checker_options.h
deleted file mode 100644
index 19fc3ffe9d17d..0000000000000
--- a/google/cloud/policytroubleshooter/iam_checker_options.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/policytroubleshooter/v1/checker.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_OPTIONS_H
-
-#include "google/cloud/policytroubleshooter/iam_checker_connection.h"
-#include "google/cloud/policytroubleshooter/iam_checker_connection_idempotency_policy.h"
-#include "google/cloud/policytroubleshooter/v1/iam_checker_options.h"
-
-namespace google {
-namespace cloud {
-namespace policytroubleshooter {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use policytroubleshooter_v1::IamCheckerBackoffPolicyOption
-/// directly.
-using ::google::cloud::policytroubleshooter_v1::IamCheckerBackoffPolicyOption;
-
-/// @deprecated Use
-/// policytroubleshooter_v1::IamCheckerConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::policytroubleshooter_v1::
-    IamCheckerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use policytroubleshooter_v1::IamCheckerPolicyOptionList
-/// directly.
-using ::google::cloud::policytroubleshooter_v1::IamCheckerPolicyOptionList;
-
-/// @deprecated Use policytroubleshooter_v1::IamCheckerRetryPolicyOption
-/// directly.
-using ::google::cloud::policytroubleshooter_v1::IamCheckerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace policytroubleshooter
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_IAM_CHECKER_OPTIONS_H
diff --git a/google/cloud/policytroubleshooter/mocks/mock_iam_checker_connection.h b/google/cloud/policytroubleshooter/mocks/mock_iam_checker_connection.h
deleted file mode 100644
index 01ac202de777a..0000000000000
--- a/google/cloud/policytroubleshooter/mocks/mock_iam_checker_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/policytroubleshooter/v1/checker.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_MOCKS_MOCK_IAM_CHECKER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_MOCKS_MOCK_IAM_CHECKER_CONNECTION_H
-
-#include "google/cloud/policytroubleshooter/iam_checker_connection.h"
-#include "google/cloud/policytroubleshooter/v1/mocks/mock_iam_checker_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in policytroubleshooter_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace policytroubleshooter_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use policytroubleshooter_v1_mocks::MockIamCheckerConnection
-/// directly.
-using ::google::cloud::policytroubleshooter_v1_mocks::MockIamCheckerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace policytroubleshooter_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_POLICYTROUBLESHOOTER_MOCKS_MOCK_IAM_CHECKER_CONNECTION_H
diff --git a/google/cloud/privateca/BUILD.bazel b/google/cloud/privateca/BUILD.bazel
index 1643b9a6e0b6a..3d4b326a2b0d6 100644
--- a/google/cloud/privateca/BUILD.bazel
+++ b/google/cloud/privateca/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/privateca/CMakeLists.txt b/google/cloud/privateca/CMakeLists.txt
index baf9739bc4be7..9ee045b49ed69 100644
--- a/google/cloud/privateca/CMakeLists.txt
+++ b/google/cloud/privateca/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(privateca "Certificate Authority API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(privateca_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/privateca/certificate_authority_client.h b/google/cloud/privateca/certificate_authority_client.h
deleted file mode 100644
index 36517ae3ee350..0000000000000
--- a/google/cloud/privateca/certificate_authority_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/security/privateca/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_CLIENT_H
-
-#include "google/cloud/privateca/certificate_authority_connection.h"
-#include "google/cloud/privateca/v1/certificate_authority_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in privateca_v1 instead of the aliases defined in
-///     this namespace.
-namespace privateca {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use privateca_v1::CertificateAuthorityServiceClient directly.
-using ::google::cloud::privateca_v1::CertificateAuthorityServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace privateca
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_CLIENT_H
diff --git a/google/cloud/privateca/certificate_authority_connection.h b/google/cloud/privateca/certificate_authority_connection.h
deleted file mode 100644
index a22893840c7a1..0000000000000
--- a/google/cloud/privateca/certificate_authority_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/security/privateca/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_CONNECTION_H
-
-#include "google/cloud/privateca/certificate_authority_connection_idempotency_policy.h"
-#include "google/cloud/privateca/v1/certificate_authority_connection.h"
-
-namespace google {
-namespace cloud {
-namespace privateca {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use privateca_v1::MakeCertificateAuthorityServiceConnection
-/// directly.
-using ::google::cloud::privateca_v1::MakeCertificateAuthorityServiceConnection;
-
-/// @deprecated Use privateca_v1::CertificateAuthorityServiceConnection
-/// directly.
-using ::google::cloud::privateca_v1::CertificateAuthorityServiceConnection;
-
-/// @deprecated Use
-/// privateca_v1::CertificateAuthorityServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::privateca_v1::
-    CertificateAuthorityServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// privateca_v1::CertificateAuthorityServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::privateca_v1::
-    CertificateAuthorityServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use privateca_v1::CertificateAuthorityServiceRetryPolicy
-/// directly.
-using ::google::cloud::privateca_v1::CertificateAuthorityServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace privateca
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_CONNECTION_H
diff --git a/google/cloud/privateca/certificate_authority_connection_idempotency_policy.h b/google/cloud/privateca/certificate_authority_connection_idempotency_policy.h
deleted file mode 100644
index 656a527afb375..0000000000000
--- a/google/cloud/privateca/certificate_authority_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/security/privateca/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/privateca/v1/certificate_authority_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace privateca {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// privateca_v1::MakeDefaultCertificateAuthorityServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::privateca_v1::
-    MakeDefaultCertificateAuthorityServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// privateca_v1::CertificateAuthorityServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::privateca_v1::
-    CertificateAuthorityServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace privateca
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/privateca/certificate_authority_options.h b/google/cloud/privateca/certificate_authority_options.h
deleted file mode 100644
index 8d5231bf40444..0000000000000
--- a/google/cloud/privateca/certificate_authority_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/security/privateca/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_OPTIONS_H
-
-#include "google/cloud/privateca/certificate_authority_connection.h"
-#include "google/cloud/privateca/certificate_authority_connection_idempotency_policy.h"
-#include "google/cloud/privateca/v1/certificate_authority_options.h"
-
-namespace google {
-namespace cloud {
-namespace privateca {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use privateca_v1::CertificateAuthorityServicePollingPolicyOption
-/// directly.
-using ::google::cloud::privateca_v1::
-    CertificateAuthorityServicePollingPolicyOption;
-
-/// @deprecated Use privateca_v1::CertificateAuthorityServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::privateca_v1::
-    CertificateAuthorityServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// privateca_v1::CertificateAuthorityServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::privateca_v1::
-    CertificateAuthorityServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use privateca_v1::CertificateAuthorityServicePolicyOptionList
-/// directly.
-using ::google::cloud::privateca_v1::
-    CertificateAuthorityServicePolicyOptionList;
-
-/// @deprecated Use privateca_v1::CertificateAuthorityServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::privateca_v1::
-    CertificateAuthorityServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace privateca
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_CERTIFICATE_AUTHORITY_OPTIONS_H
diff --git a/google/cloud/privateca/mocks/mock_certificate_authority_connection.h b/google/cloud/privateca/mocks/mock_certificate_authority_connection.h
deleted file mode 100644
index bd949536be573..0000000000000
--- a/google/cloud/privateca/mocks/mock_certificate_authority_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/security/privateca/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_MOCKS_MOCK_CERTIFICATE_AUTHORITY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_MOCKS_MOCK_CERTIFICATE_AUTHORITY_CONNECTION_H
-
-#include "google/cloud/privateca/certificate_authority_connection.h"
-#include "google/cloud/privateca/v1/mocks/mock_certificate_authority_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in privateca_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace privateca_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// privateca_v1_mocks::MockCertificateAuthorityServiceConnection directly.
-using ::google::cloud::privateca_v1_mocks::
-    MockCertificateAuthorityServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace privateca_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PRIVATECA_MOCKS_MOCK_CERTIFICATE_AUTHORITY_CONNECTION_H
diff --git a/google/cloud/profiler/BUILD.bazel b/google/cloud/profiler/BUILD.bazel
index 1341b1e63d526..71088d661fe0f 100644
--- a/google/cloud/profiler/BUILD.bazel
+++ b/google/cloud/profiler/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v2/",
 ]
 
diff --git a/google/cloud/profiler/CMakeLists.txt b/google/cloud/profiler/CMakeLists.txt
index 8e952846b266b..d425d36ec276a 100644
--- a/google/cloud/profiler/CMakeLists.txt
+++ b/google/cloud/profiler/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(profiler "Cloud Profiler API"
-                                   SERVICE_DIRS "__EMPTY__" "v2/")
+                                   SERVICE_DIRS "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(profiler_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/profiler/mocks/mock_profiler_connection.h b/google/cloud/profiler/mocks/mock_profiler_connection.h
deleted file mode 100644
index 9155164ac420e..0000000000000
--- a/google/cloud/profiler/mocks/mock_profiler_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudprofiler/v2/profiler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_MOCKS_MOCK_PROFILER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_MOCKS_MOCK_PROFILER_CONNECTION_H
-
-#include "google/cloud/profiler/profiler_connection.h"
-#include "google/cloud/profiler/v2/mocks/mock_profiler_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in profiler_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace profiler_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use profiler_v2_mocks::MockProfilerServiceConnection directly.
-using ::google::cloud::profiler_v2_mocks::MockProfilerServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace profiler_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_MOCKS_MOCK_PROFILER_CONNECTION_H
diff --git a/google/cloud/profiler/profiler_client.h b/google/cloud/profiler/profiler_client.h
deleted file mode 100644
index abc6582abf525..0000000000000
--- a/google/cloud/profiler/profiler_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudprofiler/v2/profiler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_CLIENT_H
-
-#include "google/cloud/profiler/profiler_connection.h"
-#include "google/cloud/profiler/v2/profiler_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in profiler_v2 instead of the aliases defined in
-///     this namespace.
-namespace profiler {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use profiler_v2::ProfilerServiceClient directly.
-using ::google::cloud::profiler_v2::ProfilerServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace profiler
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_CLIENT_H
diff --git a/google/cloud/profiler/profiler_connection.h b/google/cloud/profiler/profiler_connection.h
deleted file mode 100644
index 33e3f33aa4849..0000000000000
--- a/google/cloud/profiler/profiler_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudprofiler/v2/profiler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_CONNECTION_H
-
-#include "google/cloud/profiler/profiler_connection_idempotency_policy.h"
-#include "google/cloud/profiler/v2/profiler_connection.h"
-
-namespace google {
-namespace cloud {
-namespace profiler {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use profiler_v2::MakeProfilerServiceConnection directly.
-using ::google::cloud::profiler_v2::MakeProfilerServiceConnection;
-
-/// @deprecated Use profiler_v2::ProfilerServiceConnection directly.
-using ::google::cloud::profiler_v2::ProfilerServiceConnection;
-
-/// @deprecated Use profiler_v2::ProfilerServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::profiler_v2::ProfilerServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use profiler_v2::ProfilerServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::profiler_v2::ProfilerServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use profiler_v2::ProfilerServiceRetryPolicy directly.
-using ::google::cloud::profiler_v2::ProfilerServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace profiler
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_CONNECTION_H
diff --git a/google/cloud/profiler/profiler_connection_idempotency_policy.h b/google/cloud/profiler/profiler_connection_idempotency_policy.h
deleted file mode 100644
index 78967fe8d4a6f..0000000000000
--- a/google/cloud/profiler/profiler_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudprofiler/v2/profiler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/profiler/v2/profiler_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace profiler {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// profiler_v2::MakeDefaultProfilerServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::profiler_v2::
-    MakeDefaultProfilerServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use profiler_v2::ProfilerServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::profiler_v2::ProfilerServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace profiler
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/profiler/profiler_options.h b/google/cloud/profiler/profiler_options.h
deleted file mode 100644
index 3982968ccfae6..0000000000000
--- a/google/cloud/profiler/profiler_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudprofiler/v2/profiler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_OPTIONS_H
-
-#include "google/cloud/profiler/profiler_connection.h"
-#include "google/cloud/profiler/profiler_connection_idempotency_policy.h"
-#include "google/cloud/profiler/v2/profiler_options.h"
-
-namespace google {
-namespace cloud {
-namespace profiler {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use profiler_v2::ProfilerServiceBackoffPolicyOption directly.
-using ::google::cloud::profiler_v2::ProfilerServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// profiler_v2::ProfilerServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::profiler_v2::
-    ProfilerServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use profiler_v2::ProfilerServicePolicyOptionList directly.
-using ::google::cloud::profiler_v2::ProfilerServicePolicyOptionList;
-
-/// @deprecated Use profiler_v2::ProfilerServiceRetryPolicyOption directly.
-using ::google::cloud::profiler_v2::ProfilerServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace profiler
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PROFILER_PROFILER_OPTIONS_H
diff --git a/google/cloud/pubsub/samples/iam_samples.cc b/google/cloud/pubsub/samples/iam_samples.cc
index 5e880ab432532..d51f5db13323d 100644
--- a/google/cloud/pubsub/samples/iam_samples.cc
+++ b/google/cloud/pubsub/samples/iam_samples.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "google/cloud/iam/iam_policy_client.h"
+#include "google/cloud/iam/v1/iam_policy_client.h"
 #include "google/cloud/pubsub/admin/subscription_admin_client.h"
 #include "google/cloud/pubsub/admin/topic_admin_client.h"
 #include "google/cloud/pubsub/options.h"
@@ -28,7 +28,7 @@ namespace {
 
 void GetTopicPolicy(std::vector<std::string> const& argv) {
   // [START pubsub_get_topic_policy]
-  namespace iam = google::cloud::iam;
+  namespace iam = google::cloud::iam_v1;
   namespace pubsub = google::cloud::pubsub;
   [](std::string project_id, std::string topic_id) {
     auto const topic =
@@ -49,7 +49,7 @@ void GetTopicPolicy(std::vector<std::string> const& argv) {
 
 void SetTopicPolicy(std::vector<std::string> const& argv) {
   // [START pubsub_set_topic_policy]
-  namespace iam = google::cloud::iam;
+  namespace iam = google::cloud::iam_v1;
   namespace pubsub = google::cloud::pubsub;
   using google::cloud::StatusCode;
   [](std::string project_id, std::string topic_id) {
@@ -88,7 +88,7 @@ void SetTopicPolicy(std::vector<std::string> const& argv) {
 
 void TestTopicPermissions(std::vector<std::string> const& argv) {
   // [START pubsub_test_topic_permissions]
-  namespace iam = google::cloud::iam;
+  namespace iam = google::cloud::iam_v1;
   namespace pubsub = google::cloud::pubsub;
   [](std::string project_id, std::string topic_id) {
     auto const topic =
@@ -114,7 +114,7 @@ void TestTopicPermissions(std::vector<std::string> const& argv) {
 
 void GetSubscriptionPolicy(std::vector<std::string> const& argv) {
   // [START pubsub_get_subscription_policy]
-  namespace iam = google::cloud::iam;
+  namespace iam = google::cloud::iam_v1;
   namespace pubsub = google::cloud::pubsub;
   [](std::string project_id, std::string subscription_id) {
     auto const subscription =
@@ -135,7 +135,7 @@ void GetSubscriptionPolicy(std::vector<std::string> const& argv) {
 
 void SetSubscriptionPolicy(std::vector<std::string> const& argv) {
   // [START pubsub_set_subscription_policy]
-  namespace iam = google::cloud::iam;
+  namespace iam = google::cloud::iam_v1;
   namespace pubsub = google::cloud::pubsub;
   using google::cloud::StatusCode;
   [](std::string project_id, std::string subscription_id) {
@@ -174,7 +174,7 @@ void SetSubscriptionPolicy(std::vector<std::string> const& argv) {
 
 void TestSubscriptionPermissions(std::vector<std::string> const& argv) {
   // [START pubsub_test_subscription_permissions]
-  namespace iam = google::cloud::iam;
+  namespace iam = google::cloud::iam_v1;
   namespace pubsub = google::cloud::pubsub;
   [](std::string project_id, std::string subscription_id) {
     auto const subscription =
diff --git a/google/cloud/recommender/BUILD.bazel b/google/cloud/recommender/BUILD.bazel
index 11a8274c71352..5c80f93fb9350 100644
--- a/google/cloud/recommender/BUILD.bazel
+++ b/google/cloud/recommender/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/recommender/CMakeLists.txt b/google/cloud/recommender/CMakeLists.txt
index f8bec848d0913..13fe488e6c3cc 100644
--- a/google/cloud/recommender/CMakeLists.txt
+++ b/google/cloud/recommender/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(recommender "Recommender API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(recommender_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/recommender/mocks/mock_recommender_connection.h b/google/cloud/recommender/mocks/mock_recommender_connection.h
deleted file mode 100644
index 8d409093d516f..0000000000000
--- a/google/cloud/recommender/mocks/mock_recommender_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/recommender/v1/recommender_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_MOCKS_MOCK_RECOMMENDER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_MOCKS_MOCK_RECOMMENDER_CONNECTION_H
-
-#include "google/cloud/recommender/recommender_connection.h"
-#include "google/cloud/recommender/v1/mocks/mock_recommender_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in recommender_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace recommender_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use recommender_v1_mocks::MockRecommenderConnection directly.
-using ::google::cloud::recommender_v1_mocks::MockRecommenderConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace recommender_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_MOCKS_MOCK_RECOMMENDER_CONNECTION_H
diff --git a/google/cloud/recommender/recommender_client.h b/google/cloud/recommender/recommender_client.h
deleted file mode 100644
index 99c254bfac3b4..0000000000000
--- a/google/cloud/recommender/recommender_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/recommender/v1/recommender_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_CLIENT_H
-
-#include "google/cloud/recommender/recommender_connection.h"
-#include "google/cloud/recommender/v1/recommender_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in recommender_v1 instead of the aliases defined in
-///     this namespace.
-namespace recommender {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use recommender_v1::RecommenderClient directly.
-using ::google::cloud::recommender_v1::RecommenderClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace recommender
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_CLIENT_H
diff --git a/google/cloud/recommender/recommender_connection.h b/google/cloud/recommender/recommender_connection.h
deleted file mode 100644
index dd941ccd11ecd..0000000000000
--- a/google/cloud/recommender/recommender_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/recommender/v1/recommender_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_CONNECTION_H
-
-#include "google/cloud/recommender/recommender_connection_idempotency_policy.h"
-#include "google/cloud/recommender/v1/recommender_connection.h"
-
-namespace google {
-namespace cloud {
-namespace recommender {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use recommender_v1::MakeRecommenderConnection directly.
-using ::google::cloud::recommender_v1::MakeRecommenderConnection;
-
-/// @deprecated Use recommender_v1::RecommenderConnection directly.
-using ::google::cloud::recommender_v1::RecommenderConnection;
-
-/// @deprecated Use recommender_v1::RecommenderLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::recommender_v1::RecommenderLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use recommender_v1::RecommenderLimitedTimeRetryPolicy directly.
-using ::google::cloud::recommender_v1::RecommenderLimitedTimeRetryPolicy;
-
-/// @deprecated Use recommender_v1::RecommenderRetryPolicy directly.
-using ::google::cloud::recommender_v1::RecommenderRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace recommender
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_CONNECTION_H
diff --git a/google/cloud/recommender/recommender_connection_idempotency_policy.h b/google/cloud/recommender/recommender_connection_idempotency_policy.h
deleted file mode 100644
index 53a4dbaa38e0a..0000000000000
--- a/google/cloud/recommender/recommender_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/recommender/v1/recommender_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/recommender/v1/recommender_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace recommender {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// recommender_v1::MakeDefaultRecommenderConnectionIdempotencyPolicy directly.
-using ::google::cloud::recommender_v1::
-    MakeDefaultRecommenderConnectionIdempotencyPolicy;
-
-/// @deprecated Use recommender_v1::RecommenderConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::recommender_v1::RecommenderConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace recommender
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/recommender/recommender_options.h b/google/cloud/recommender/recommender_options.h
deleted file mode 100644
index 5571cb440fb7c..0000000000000
--- a/google/cloud/recommender/recommender_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/recommender/v1/recommender_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_OPTIONS_H
-
-#include "google/cloud/recommender/recommender_connection.h"
-#include "google/cloud/recommender/recommender_connection_idempotency_policy.h"
-#include "google/cloud/recommender/v1/recommender_options.h"
-
-namespace google {
-namespace cloud {
-namespace recommender {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use recommender_v1::RecommenderBackoffPolicyOption directly.
-using ::google::cloud::recommender_v1::RecommenderBackoffPolicyOption;
-
-/// @deprecated Use recommender_v1::RecommenderConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::recommender_v1::
-    RecommenderConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use recommender_v1::RecommenderPolicyOptionList directly.
-using ::google::cloud::recommender_v1::RecommenderPolicyOptionList;
-
-/// @deprecated Use recommender_v1::RecommenderRetryPolicyOption directly.
-using ::google::cloud::recommender_v1::RecommenderRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace recommender
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RECOMMENDER_RECOMMENDER_OPTIONS_H
diff --git a/google/cloud/redis/BUILD.bazel b/google/cloud/redis/BUILD.bazel
index 7c48afd608d7a..a544642374509 100644
--- a/google/cloud/redis/BUILD.bazel
+++ b/google/cloud/redis/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "cluster/v1/",
 ]
diff --git a/google/cloud/redis/CMakeLists.txt b/google/cloud/redis/CMakeLists.txt
index 3cd59d7a73a3a..e3eb251c39b97 100644
--- a/google/cloud/redis/CMakeLists.txt
+++ b/google/cloud/redis/CMakeLists.txt
@@ -17,8 +17,8 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
-    redis "Google Cloud Memorystore for Redis API"
-    SERVICE_DIRS "__EMPTY__" "v1/" "cluster/v1/")
+    redis "Google Cloud Memorystore for Redis API" SERVICE_DIRS "v1/"
+                                                                "cluster/v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(redis_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/redis/cloud_redis_client.h b/google/cloud/redis/cloud_redis_client.h
deleted file mode 100644
index b6ea589535b4c..0000000000000
--- a/google/cloud/redis/cloud_redis_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/redis/v1/cloud_redis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_CLIENT_H
-
-#include "google/cloud/redis/cloud_redis_connection.h"
-#include "google/cloud/redis/v1/cloud_redis_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in redis_v1 instead of the aliases defined in
-///     this namespace.
-namespace redis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use redis_v1::CloudRedisClient directly.
-using ::google::cloud::redis_v1::CloudRedisClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace redis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_CLIENT_H
diff --git a/google/cloud/redis/cloud_redis_connection.h b/google/cloud/redis/cloud_redis_connection.h
deleted file mode 100644
index df36b16d700af..0000000000000
--- a/google/cloud/redis/cloud_redis_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/redis/v1/cloud_redis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_CONNECTION_H
-
-#include "google/cloud/redis/cloud_redis_connection_idempotency_policy.h"
-#include "google/cloud/redis/v1/cloud_redis_connection.h"
-
-namespace google {
-namespace cloud {
-namespace redis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use redis_v1::MakeCloudRedisConnection directly.
-using ::google::cloud::redis_v1::MakeCloudRedisConnection;
-
-/// @deprecated Use redis_v1::CloudRedisConnection directly.
-using ::google::cloud::redis_v1::CloudRedisConnection;
-
-/// @deprecated Use redis_v1::CloudRedisLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::redis_v1::CloudRedisLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use redis_v1::CloudRedisLimitedTimeRetryPolicy directly.
-using ::google::cloud::redis_v1::CloudRedisLimitedTimeRetryPolicy;
-
-/// @deprecated Use redis_v1::CloudRedisRetryPolicy directly.
-using ::google::cloud::redis_v1::CloudRedisRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace redis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_CONNECTION_H
diff --git a/google/cloud/redis/cloud_redis_connection_idempotency_policy.h b/google/cloud/redis/cloud_redis_connection_idempotency_policy.h
deleted file mode 100644
index ccc7f92766991..0000000000000
--- a/google/cloud/redis/cloud_redis_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/redis/v1/cloud_redis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/redis/v1/cloud_redis_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace redis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use redis_v1::MakeDefaultCloudRedisConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::redis_v1::
-    MakeDefaultCloudRedisConnectionIdempotencyPolicy;
-
-/// @deprecated Use redis_v1::CloudRedisConnectionIdempotencyPolicy directly.
-using ::google::cloud::redis_v1::CloudRedisConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace redis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/redis/cloud_redis_options.h b/google/cloud/redis/cloud_redis_options.h
deleted file mode 100644
index 30cf04d4f8068..0000000000000
--- a/google/cloud/redis/cloud_redis_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/redis/v1/cloud_redis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_OPTIONS_H
-
-#include "google/cloud/redis/cloud_redis_connection.h"
-#include "google/cloud/redis/cloud_redis_connection_idempotency_policy.h"
-#include "google/cloud/redis/v1/cloud_redis_options.h"
-
-namespace google {
-namespace cloud {
-namespace redis {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use redis_v1::CloudRedisPollingPolicyOption directly.
-using ::google::cloud::redis_v1::CloudRedisPollingPolicyOption;
-
-/// @deprecated Use redis_v1::CloudRedisBackoffPolicyOption directly.
-using ::google::cloud::redis_v1::CloudRedisBackoffPolicyOption;
-
-/// @deprecated Use redis_v1::CloudRedisConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::redis_v1::CloudRedisConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use redis_v1::CloudRedisPolicyOptionList directly.
-using ::google::cloud::redis_v1::CloudRedisPolicyOptionList;
-
-/// @deprecated Use redis_v1::CloudRedisRetryPolicyOption directly.
-using ::google::cloud::redis_v1::CloudRedisRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace redis
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_CLOUD_REDIS_OPTIONS_H
diff --git a/google/cloud/redis/mocks/mock_cloud_redis_connection.h b/google/cloud/redis/mocks/mock_cloud_redis_connection.h
deleted file mode 100644
index 688841304e377..0000000000000
--- a/google/cloud/redis/mocks/mock_cloud_redis_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/redis/v1/cloud_redis.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_MOCKS_MOCK_CLOUD_REDIS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_MOCKS_MOCK_CLOUD_REDIS_CONNECTION_H
-
-#include "google/cloud/redis/cloud_redis_connection.h"
-#include "google/cloud/redis/v1/mocks/mock_cloud_redis_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in redis_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace redis_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use redis_v1_mocks::MockCloudRedisConnection directly.
-using ::google::cloud::redis_v1_mocks::MockCloudRedisConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace redis_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_REDIS_MOCKS_MOCK_CLOUD_REDIS_CONNECTION_H
diff --git a/google/cloud/resourcemanager/BUILD.bazel b/google/cloud/resourcemanager/BUILD.bazel
index ef635838e1f5a..f3ce3b6ccc9d8 100644
--- a/google/cloud/resourcemanager/BUILD.bazel
+++ b/google/cloud/resourcemanager/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v3/",
 ]
 
diff --git a/google/cloud/resourcemanager/CMakeLists.txt b/google/cloud/resourcemanager/CMakeLists.txt
index eaaf21b473bf7..03a87c65fdd0e 100644
--- a/google/cloud/resourcemanager/CMakeLists.txt
+++ b/google/cloud/resourcemanager/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(resourcemanager "Cloud Resource Manager API"
-                                   SERVICE_DIRS "__EMPTY__" "v3/")
+                                   SERVICE_DIRS "v3/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(resourcemanager_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/resourcemanager/folders_client.h b/google/cloud/resourcemanager/folders_client.h
deleted file mode 100644
index e691d806b44db..0000000000000
--- a/google/cloud/resourcemanager/folders_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/folders.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_CLIENT_H
-
-#include "google/cloud/resourcemanager/folders_connection.h"
-#include "google/cloud/resourcemanager/v3/folders_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in resourcemanager_v3 instead of the aliases defined in
-///     this namespace.
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3::FoldersClient directly.
-using ::google::cloud::resourcemanager_v3::FoldersClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_CLIENT_H
diff --git a/google/cloud/resourcemanager/folders_connection.h b/google/cloud/resourcemanager/folders_connection.h
deleted file mode 100644
index 1686625c5f061..0000000000000
--- a/google/cloud/resourcemanager/folders_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/folders.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_CONNECTION_H
-
-#include "google/cloud/resourcemanager/folders_connection_idempotency_policy.h"
-#include "google/cloud/resourcemanager/v3/folders_connection.h"
-
-namespace google {
-namespace cloud {
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3::MakeFoldersConnection directly.
-using ::google::cloud::resourcemanager_v3::MakeFoldersConnection;
-
-/// @deprecated Use resourcemanager_v3::FoldersConnection directly.
-using ::google::cloud::resourcemanager_v3::FoldersConnection;
-
-/// @deprecated Use resourcemanager_v3::FoldersLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::resourcemanager_v3::FoldersLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use resourcemanager_v3::FoldersLimitedTimeRetryPolicy directly.
-using ::google::cloud::resourcemanager_v3::FoldersLimitedTimeRetryPolicy;
-
-/// @deprecated Use resourcemanager_v3::FoldersRetryPolicy directly.
-using ::google::cloud::resourcemanager_v3::FoldersRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_CONNECTION_H
diff --git a/google/cloud/resourcemanager/folders_connection_idempotency_policy.h b/google/cloud/resourcemanager/folders_connection_idempotency_policy.h
deleted file mode 100644
index 7beb79d7f43cb..0000000000000
--- a/google/cloud/resourcemanager/folders_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/folders.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/resourcemanager/v3/folders_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// resourcemanager_v3::MakeDefaultFoldersConnectionIdempotencyPolicy directly.
-using ::google::cloud::resourcemanager_v3::
-    MakeDefaultFoldersConnectionIdempotencyPolicy;
-
-/// @deprecated Use resourcemanager_v3::FoldersConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::resourcemanager_v3::FoldersConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/resourcemanager/folders_options.h b/google/cloud/resourcemanager/folders_options.h
deleted file mode 100644
index 70b9a48a3f20e..0000000000000
--- a/google/cloud/resourcemanager/folders_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/folders.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_OPTIONS_H
-
-#include "google/cloud/resourcemanager/folders_connection.h"
-#include "google/cloud/resourcemanager/folders_connection_idempotency_policy.h"
-#include "google/cloud/resourcemanager/v3/folders_options.h"
-
-namespace google {
-namespace cloud {
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3::FoldersPollingPolicyOption directly.
-using ::google::cloud::resourcemanager_v3::FoldersPollingPolicyOption;
-
-/// @deprecated Use resourcemanager_v3::FoldersBackoffPolicyOption directly.
-using ::google::cloud::resourcemanager_v3::FoldersBackoffPolicyOption;
-
-/// @deprecated Use resourcemanager_v3::FoldersConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::resourcemanager_v3::
-    FoldersConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use resourcemanager_v3::FoldersPolicyOptionList directly.
-using ::google::cloud::resourcemanager_v3::FoldersPolicyOptionList;
-
-/// @deprecated Use resourcemanager_v3::FoldersRetryPolicyOption directly.
-using ::google::cloud::resourcemanager_v3::FoldersRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_FOLDERS_OPTIONS_H
diff --git a/google/cloud/resourcemanager/mocks/mock_folders_connection.h b/google/cloud/resourcemanager/mocks/mock_folders_connection.h
deleted file mode 100644
index 0dc421cf90e86..0000000000000
--- a/google/cloud/resourcemanager/mocks/mock_folders_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/folders.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_MOCKS_MOCK_FOLDERS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_MOCKS_MOCK_FOLDERS_CONNECTION_H
-
-#include "google/cloud/resourcemanager/folders_connection.h"
-#include "google/cloud/resourcemanager/v3/mocks/mock_folders_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in resourcemanager_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace resourcemanager_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3_mocks::MockFoldersConnection directly.
-using ::google::cloud::resourcemanager_v3_mocks::MockFoldersConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_MOCKS_MOCK_FOLDERS_CONNECTION_H
diff --git a/google/cloud/resourcemanager/mocks/mock_organizations_connection.h b/google/cloud/resourcemanager/mocks/mock_organizations_connection.h
deleted file mode 100644
index 04c0cc8420d7f..0000000000000
--- a/google/cloud/resourcemanager/mocks/mock_organizations_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/organizations.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_MOCKS_MOCK_ORGANIZATIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_MOCKS_MOCK_ORGANIZATIONS_CONNECTION_H
-
-#include "google/cloud/resourcemanager/organizations_connection.h"
-#include "google/cloud/resourcemanager/v3/mocks/mock_organizations_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in resourcemanager_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace resourcemanager_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3_mocks::MockOrganizationsConnection
-/// directly.
-using ::google::cloud::resourcemanager_v3_mocks::MockOrganizationsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_MOCKS_MOCK_ORGANIZATIONS_CONNECTION_H
diff --git a/google/cloud/resourcemanager/mocks/mock_projects_connection.h b/google/cloud/resourcemanager/mocks/mock_projects_connection.h
deleted file mode 100644
index ea4c93c44cb9d..0000000000000
--- a/google/cloud/resourcemanager/mocks/mock_projects_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/projects.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_MOCKS_MOCK_PROJECTS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_MOCKS_MOCK_PROJECTS_CONNECTION_H
-
-#include "google/cloud/resourcemanager/projects_connection.h"
-#include "google/cloud/resourcemanager/v3/mocks/mock_projects_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in resourcemanager_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace resourcemanager_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3_mocks::MockProjectsConnection directly.
-using ::google::cloud::resourcemanager_v3_mocks::MockProjectsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_MOCKS_MOCK_PROJECTS_CONNECTION_H
diff --git a/google/cloud/resourcemanager/organizations_client.h b/google/cloud/resourcemanager/organizations_client.h
deleted file mode 100644
index 570f1f03cd7bd..0000000000000
--- a/google/cloud/resourcemanager/organizations_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/organizations.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_CLIENT_H
-
-#include "google/cloud/resourcemanager/organizations_connection.h"
-#include "google/cloud/resourcemanager/v3/organizations_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in resourcemanager_v3 instead of the aliases defined in
-///     this namespace.
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3::OrganizationsClient directly.
-using ::google::cloud::resourcemanager_v3::OrganizationsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_CLIENT_H
diff --git a/google/cloud/resourcemanager/organizations_connection.h b/google/cloud/resourcemanager/organizations_connection.h
deleted file mode 100644
index 04eb118e55070..0000000000000
--- a/google/cloud/resourcemanager/organizations_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/organizations.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_CONNECTION_H
-
-#include "google/cloud/resourcemanager/organizations_connection_idempotency_policy.h"
-#include "google/cloud/resourcemanager/v3/organizations_connection.h"
-
-namespace google {
-namespace cloud {
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3::MakeOrganizationsConnection directly.
-using ::google::cloud::resourcemanager_v3::MakeOrganizationsConnection;
-
-/// @deprecated Use resourcemanager_v3::OrganizationsConnection directly.
-using ::google::cloud::resourcemanager_v3::OrganizationsConnection;
-
-/// @deprecated Use
-/// resourcemanager_v3::OrganizationsLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::resourcemanager_v3::
-    OrganizationsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use resourcemanager_v3::OrganizationsLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::resourcemanager_v3::OrganizationsLimitedTimeRetryPolicy;
-
-/// @deprecated Use resourcemanager_v3::OrganizationsRetryPolicy directly.
-using ::google::cloud::resourcemanager_v3::OrganizationsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_CONNECTION_H
diff --git a/google/cloud/resourcemanager/organizations_connection_idempotency_policy.h b/google/cloud/resourcemanager/organizations_connection_idempotency_policy.h
deleted file mode 100644
index 8b9b8ec04aac5..0000000000000
--- a/google/cloud/resourcemanager/organizations_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/organizations.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/resourcemanager/v3/organizations_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// resourcemanager_v3::MakeDefaultOrganizationsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::resourcemanager_v3::
-    MakeDefaultOrganizationsConnectionIdempotencyPolicy;
-
-/// @deprecated Use resourcemanager_v3::OrganizationsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::resourcemanager_v3::
-    OrganizationsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/resourcemanager/organizations_options.h b/google/cloud/resourcemanager/organizations_options.h
deleted file mode 100644
index 4b36973f2a7ad..0000000000000
--- a/google/cloud/resourcemanager/organizations_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/organizations.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_OPTIONS_H
-
-#include "google/cloud/resourcemanager/organizations_connection.h"
-#include "google/cloud/resourcemanager/organizations_connection_idempotency_policy.h"
-#include "google/cloud/resourcemanager/v3/organizations_options.h"
-
-namespace google {
-namespace cloud {
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3::OrganizationsBackoffPolicyOption
-/// directly.
-using ::google::cloud::resourcemanager_v3::OrganizationsBackoffPolicyOption;
-
-/// @deprecated Use
-/// resourcemanager_v3::OrganizationsConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::resourcemanager_v3::
-    OrganizationsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use resourcemanager_v3::OrganizationsPolicyOptionList directly.
-using ::google::cloud::resourcemanager_v3::OrganizationsPolicyOptionList;
-
-/// @deprecated Use resourcemanager_v3::OrganizationsRetryPolicyOption directly.
-using ::google::cloud::resourcemanager_v3::OrganizationsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_ORGANIZATIONS_OPTIONS_H
diff --git a/google/cloud/resourcemanager/projects_client.h b/google/cloud/resourcemanager/projects_client.h
deleted file mode 100644
index 386963ae508d8..0000000000000
--- a/google/cloud/resourcemanager/projects_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/projects.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_CLIENT_H
-
-#include "google/cloud/resourcemanager/projects_connection.h"
-#include "google/cloud/resourcemanager/v3/projects_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in resourcemanager_v3 instead of the aliases defined in
-///     this namespace.
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3::ProjectsClient directly.
-using ::google::cloud::resourcemanager_v3::ProjectsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_CLIENT_H
diff --git a/google/cloud/resourcemanager/projects_connection.h b/google/cloud/resourcemanager/projects_connection.h
deleted file mode 100644
index 6fe6d7926e88d..0000000000000
--- a/google/cloud/resourcemanager/projects_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/projects.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_CONNECTION_H
-
-#include "google/cloud/resourcemanager/projects_connection_idempotency_policy.h"
-#include "google/cloud/resourcemanager/v3/projects_connection.h"
-
-namespace google {
-namespace cloud {
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3::MakeProjectsConnection directly.
-using ::google::cloud::resourcemanager_v3::MakeProjectsConnection;
-
-/// @deprecated Use resourcemanager_v3::ProjectsConnection directly.
-using ::google::cloud::resourcemanager_v3::ProjectsConnection;
-
-/// @deprecated Use resourcemanager_v3::ProjectsLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::resourcemanager_v3::ProjectsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use resourcemanager_v3::ProjectsLimitedTimeRetryPolicy directly.
-using ::google::cloud::resourcemanager_v3::ProjectsLimitedTimeRetryPolicy;
-
-/// @deprecated Use resourcemanager_v3::ProjectsRetryPolicy directly.
-using ::google::cloud::resourcemanager_v3::ProjectsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_CONNECTION_H
diff --git a/google/cloud/resourcemanager/projects_connection_idempotency_policy.h b/google/cloud/resourcemanager/projects_connection_idempotency_policy.h
deleted file mode 100644
index 5b9af7e5e0405..0000000000000
--- a/google/cloud/resourcemanager/projects_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/projects.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/resourcemanager/v3/projects_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// resourcemanager_v3::MakeDefaultProjectsConnectionIdempotencyPolicy directly.
-using ::google::cloud::resourcemanager_v3::
-    MakeDefaultProjectsConnectionIdempotencyPolicy;
-
-/// @deprecated Use resourcemanager_v3::ProjectsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::resourcemanager_v3::ProjectsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/resourcemanager/projects_options.h b/google/cloud/resourcemanager/projects_options.h
deleted file mode 100644
index ad370fe464328..0000000000000
--- a/google/cloud/resourcemanager/projects_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/resourcemanager/v3/projects.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_OPTIONS_H
-
-#include "google/cloud/resourcemanager/projects_connection.h"
-#include "google/cloud/resourcemanager/projects_connection_idempotency_policy.h"
-#include "google/cloud/resourcemanager/v3/projects_options.h"
-
-namespace google {
-namespace cloud {
-namespace resourcemanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use resourcemanager_v3::ProjectsPollingPolicyOption directly.
-using ::google::cloud::resourcemanager_v3::ProjectsPollingPolicyOption;
-
-/// @deprecated Use resourcemanager_v3::ProjectsBackoffPolicyOption directly.
-using ::google::cloud::resourcemanager_v3::ProjectsBackoffPolicyOption;
-
-/// @deprecated Use
-/// resourcemanager_v3::ProjectsConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::resourcemanager_v3::
-    ProjectsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use resourcemanager_v3::ProjectsPolicyOptionList directly.
-using ::google::cloud::resourcemanager_v3::ProjectsPolicyOptionList;
-
-/// @deprecated Use resourcemanager_v3::ProjectsRetryPolicyOption directly.
-using ::google::cloud::resourcemanager_v3::ProjectsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace resourcemanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCEMANAGER_PROJECTS_OPTIONS_H
diff --git a/google/cloud/retail/BUILD.bazel b/google/cloud/retail/BUILD.bazel
index 973720a2cddb1..66ddfb8fe3f50 100644
--- a/google/cloud/retail/BUILD.bazel
+++ b/google/cloud/retail/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v2/",
 ]
 
diff --git a/google/cloud/retail/CMakeLists.txt b/google/cloud/retail/CMakeLists.txt
index be28238a9467a..3fae2da7d02ff 100644
--- a/google/cloud/retail/CMakeLists.txt
+++ b/google/cloud/retail/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(retail "Retail API" SERVICE_DIRS "__EMPTY__"
-                                                                    "v2/")
+google_cloud_cpp_add_gapic_library(retail "Retail API" SERVICE_DIRS "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(retail_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/retail/catalog_client.h b/google/cloud/retail/catalog_client.h
deleted file mode 100644
index 5bf15bb2f33b4..0000000000000
--- a/google/cloud/retail/catalog_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/catalog_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_CLIENT_H
-
-#include "google/cloud/retail/catalog_connection.h"
-#include "google/cloud/retail/v2/catalog_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2 instead of the aliases defined in
-///     this namespace.
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::CatalogServiceClient directly.
-using ::google::cloud::retail_v2::CatalogServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_CLIENT_H
diff --git a/google/cloud/retail/catalog_connection.h b/google/cloud/retail/catalog_connection.h
deleted file mode 100644
index 3c54b08608104..0000000000000
--- a/google/cloud/retail/catalog_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/catalog_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_CONNECTION_H
-
-#include "google/cloud/retail/catalog_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/catalog_connection.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::MakeCatalogServiceConnection directly.
-using ::google::cloud::retail_v2::MakeCatalogServiceConnection;
-
-/// @deprecated Use retail_v2::CatalogServiceConnection directly.
-using ::google::cloud::retail_v2::CatalogServiceConnection;
-
-/// @deprecated Use retail_v2::CatalogServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::retail_v2::CatalogServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use retail_v2::CatalogServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::retail_v2::CatalogServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use retail_v2::CatalogServiceRetryPolicy directly.
-using ::google::cloud::retail_v2::CatalogServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_CONNECTION_H
diff --git a/google/cloud/retail/catalog_connection_idempotency_policy.h b/google/cloud/retail/catalog_connection_idempotency_policy.h
deleted file mode 100644
index 32b6e463b179f..0000000000000
--- a/google/cloud/retail/catalog_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/catalog_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/retail/v2/catalog_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// retail_v2::MakeDefaultCatalogServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::retail_v2::
-    MakeDefaultCatalogServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use retail_v2::CatalogServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::retail_v2::CatalogServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/retail/catalog_options.h b/google/cloud/retail/catalog_options.h
deleted file mode 100644
index 6720890fab1e1..0000000000000
--- a/google/cloud/retail/catalog_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/catalog_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_OPTIONS_H
-
-#include "google/cloud/retail/catalog_connection.h"
-#include "google/cloud/retail/catalog_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/catalog_options.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::CatalogServiceBackoffPolicyOption directly.
-using ::google::cloud::retail_v2::CatalogServiceBackoffPolicyOption;
-
-/// @deprecated Use retail_v2::CatalogServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::retail_v2::
-    CatalogServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use retail_v2::CatalogServicePolicyOptionList directly.
-using ::google::cloud::retail_v2::CatalogServicePolicyOptionList;
-
-/// @deprecated Use retail_v2::CatalogServiceRetryPolicyOption directly.
-using ::google::cloud::retail_v2::CatalogServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_CATALOG_OPTIONS_H
diff --git a/google/cloud/retail/completion_client.h b/google/cloud/retail/completion_client.h
deleted file mode 100644
index 150c0be77b99a..0000000000000
--- a/google/cloud/retail/completion_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_CLIENT_H
-
-#include "google/cloud/retail/completion_connection.h"
-#include "google/cloud/retail/v2/completion_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2 instead of the aliases defined in
-///     this namespace.
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::CompletionServiceClient directly.
-using ::google::cloud::retail_v2::CompletionServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_CLIENT_H
diff --git a/google/cloud/retail/completion_connection.h b/google/cloud/retail/completion_connection.h
deleted file mode 100644
index de3992ee9c8d7..0000000000000
--- a/google/cloud/retail/completion_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_CONNECTION_H
-
-#include "google/cloud/retail/completion_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/completion_connection.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::MakeCompletionServiceConnection directly.
-using ::google::cloud::retail_v2::MakeCompletionServiceConnection;
-
-/// @deprecated Use retail_v2::CompletionServiceConnection directly.
-using ::google::cloud::retail_v2::CompletionServiceConnection;
-
-/// @deprecated Use retail_v2::CompletionServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::retail_v2::CompletionServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use retail_v2::CompletionServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::retail_v2::CompletionServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use retail_v2::CompletionServiceRetryPolicy directly.
-using ::google::cloud::retail_v2::CompletionServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_CONNECTION_H
diff --git a/google/cloud/retail/completion_connection_idempotency_policy.h b/google/cloud/retail/completion_connection_idempotency_policy.h
deleted file mode 100644
index 5a6c4dd5276c5..0000000000000
--- a/google/cloud/retail/completion_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/retail/v2/completion_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// retail_v2::MakeDefaultCompletionServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::retail_v2::
-    MakeDefaultCompletionServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use retail_v2::CompletionServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::retail_v2::CompletionServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/retail/completion_options.h b/google/cloud/retail/completion_options.h
deleted file mode 100644
index eab9c65ab81fd..0000000000000
--- a/google/cloud/retail/completion_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_OPTIONS_H
-
-#include "google/cloud/retail/completion_connection.h"
-#include "google/cloud/retail/completion_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/completion_options.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::CompletionServicePollingPolicyOption directly.
-using ::google::cloud::retail_v2::CompletionServicePollingPolicyOption;
-
-/// @deprecated Use retail_v2::CompletionServiceBackoffPolicyOption directly.
-using ::google::cloud::retail_v2::CompletionServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// retail_v2::CompletionServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::retail_v2::
-    CompletionServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use retail_v2::CompletionServicePolicyOptionList directly.
-using ::google::cloud::retail_v2::CompletionServicePolicyOptionList;
-
-/// @deprecated Use retail_v2::CompletionServiceRetryPolicyOption directly.
-using ::google::cloud::retail_v2::CompletionServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_COMPLETION_OPTIONS_H
diff --git a/google/cloud/retail/mocks/mock_catalog_connection.h b/google/cloud/retail/mocks/mock_catalog_connection.h
deleted file mode 100644
index 09937f7ef4027..0000000000000
--- a/google/cloud/retail/mocks/mock_catalog_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/catalog_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_CATALOG_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_CATALOG_CONNECTION_H
-
-#include "google/cloud/retail/catalog_connection.h"
-#include "google/cloud/retail/v2/mocks/mock_catalog_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace retail_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2_mocks::MockCatalogServiceConnection directly.
-using ::google::cloud::retail_v2_mocks::MockCatalogServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_CATALOG_CONNECTION_H
diff --git a/google/cloud/retail/mocks/mock_completion_connection.h b/google/cloud/retail/mocks/mock_completion_connection.h
deleted file mode 100644
index 0e393d0d53b27..0000000000000
--- a/google/cloud/retail/mocks/mock_completion_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_COMPLETION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_COMPLETION_CONNECTION_H
-
-#include "google/cloud/retail/completion_connection.h"
-#include "google/cloud/retail/v2/mocks/mock_completion_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace retail_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2_mocks::MockCompletionServiceConnection directly.
-using ::google::cloud::retail_v2_mocks::MockCompletionServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_COMPLETION_CONNECTION_H
diff --git a/google/cloud/retail/mocks/mock_prediction_connection.h b/google/cloud/retail/mocks/mock_prediction_connection.h
deleted file mode 100644
index 68c508cbaf8d8..0000000000000
--- a/google/cloud/retail/mocks/mock_prediction_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_PREDICTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_PREDICTION_CONNECTION_H
-
-#include "google/cloud/retail/prediction_connection.h"
-#include "google/cloud/retail/v2/mocks/mock_prediction_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace retail_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2_mocks::MockPredictionServiceConnection directly.
-using ::google::cloud::retail_v2_mocks::MockPredictionServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_PREDICTION_CONNECTION_H
diff --git a/google/cloud/retail/mocks/mock_product_connection.h b/google/cloud/retail/mocks/mock_product_connection.h
deleted file mode 100644
index d9248c5b7584c..0000000000000
--- a/google/cloud/retail/mocks/mock_product_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/product_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_PRODUCT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_PRODUCT_CONNECTION_H
-
-#include "google/cloud/retail/product_connection.h"
-#include "google/cloud/retail/v2/mocks/mock_product_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace retail_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2_mocks::MockProductServiceConnection directly.
-using ::google::cloud::retail_v2_mocks::MockProductServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_PRODUCT_CONNECTION_H
diff --git a/google/cloud/retail/mocks/mock_search_connection.h b/google/cloud/retail/mocks/mock_search_connection.h
deleted file mode 100644
index db4dfca824873..0000000000000
--- a/google/cloud/retail/mocks/mock_search_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_SEARCH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_SEARCH_CONNECTION_H
-
-#include "google/cloud/retail/search_connection.h"
-#include "google/cloud/retail/v2/mocks/mock_search_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace retail_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2_mocks::MockSearchServiceConnection directly.
-using ::google::cloud::retail_v2_mocks::MockSearchServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_SEARCH_CONNECTION_H
diff --git a/google/cloud/retail/mocks/mock_user_event_connection.h b/google/cloud/retail/mocks/mock_user_event_connection.h
deleted file mode 100644
index 3330e4924edf0..0000000000000
--- a/google/cloud/retail/mocks/mock_user_event_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/user_event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_USER_EVENT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_USER_EVENT_CONNECTION_H
-
-#include "google/cloud/retail/user_event_connection.h"
-#include "google/cloud/retail/v2/mocks/mock_user_event_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace retail_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2_mocks::MockUserEventServiceConnection directly.
-using ::google::cloud::retail_v2_mocks::MockUserEventServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_MOCKS_MOCK_USER_EVENT_CONNECTION_H
diff --git a/google/cloud/retail/prediction_client.h b/google/cloud/retail/prediction_client.h
deleted file mode 100644
index 1b9c447f01fc6..0000000000000
--- a/google/cloud/retail/prediction_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_CLIENT_H
-
-#include "google/cloud/retail/prediction_connection.h"
-#include "google/cloud/retail/v2/prediction_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2 instead of the aliases defined in
-///     this namespace.
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::PredictionServiceClient directly.
-using ::google::cloud::retail_v2::PredictionServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_CLIENT_H
diff --git a/google/cloud/retail/prediction_connection.h b/google/cloud/retail/prediction_connection.h
deleted file mode 100644
index 3d38053c741d3..0000000000000
--- a/google/cloud/retail/prediction_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_CONNECTION_H
-
-#include "google/cloud/retail/prediction_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/prediction_connection.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::MakePredictionServiceConnection directly.
-using ::google::cloud::retail_v2::MakePredictionServiceConnection;
-
-/// @deprecated Use retail_v2::PredictionServiceConnection directly.
-using ::google::cloud::retail_v2::PredictionServiceConnection;
-
-/// @deprecated Use retail_v2::PredictionServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::retail_v2::PredictionServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use retail_v2::PredictionServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::retail_v2::PredictionServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use retail_v2::PredictionServiceRetryPolicy directly.
-using ::google::cloud::retail_v2::PredictionServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_CONNECTION_H
diff --git a/google/cloud/retail/prediction_connection_idempotency_policy.h b/google/cloud/retail/prediction_connection_idempotency_policy.h
deleted file mode 100644
index 85b9350df0136..0000000000000
--- a/google/cloud/retail/prediction_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/retail/v2/prediction_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// retail_v2::MakeDefaultPredictionServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::retail_v2::
-    MakeDefaultPredictionServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use retail_v2::PredictionServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::retail_v2::PredictionServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/retail/prediction_options.h b/google/cloud/retail/prediction_options.h
deleted file mode 100644
index 255856f20cc6b..0000000000000
--- a/google/cloud/retail/prediction_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/prediction_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_OPTIONS_H
-
-#include "google/cloud/retail/prediction_connection.h"
-#include "google/cloud/retail/prediction_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/prediction_options.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::PredictionServiceBackoffPolicyOption directly.
-using ::google::cloud::retail_v2::PredictionServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// retail_v2::PredictionServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::retail_v2::
-    PredictionServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use retail_v2::PredictionServicePolicyOptionList directly.
-using ::google::cloud::retail_v2::PredictionServicePolicyOptionList;
-
-/// @deprecated Use retail_v2::PredictionServiceRetryPolicyOption directly.
-using ::google::cloud::retail_v2::PredictionServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PREDICTION_OPTIONS_H
diff --git a/google/cloud/retail/product_client.h b/google/cloud/retail/product_client.h
deleted file mode 100644
index 1345b7daed323..0000000000000
--- a/google/cloud/retail/product_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/product_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_CLIENT_H
-
-#include "google/cloud/retail/product_connection.h"
-#include "google/cloud/retail/v2/product_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2 instead of the aliases defined in
-///     this namespace.
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::ProductServiceClient directly.
-using ::google::cloud::retail_v2::ProductServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_CLIENT_H
diff --git a/google/cloud/retail/product_connection.h b/google/cloud/retail/product_connection.h
deleted file mode 100644
index 31a961ce64780..0000000000000
--- a/google/cloud/retail/product_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/product_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_CONNECTION_H
-
-#include "google/cloud/retail/product_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/product_connection.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::MakeProductServiceConnection directly.
-using ::google::cloud::retail_v2::MakeProductServiceConnection;
-
-/// @deprecated Use retail_v2::ProductServiceConnection directly.
-using ::google::cloud::retail_v2::ProductServiceConnection;
-
-/// @deprecated Use retail_v2::ProductServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::retail_v2::ProductServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use retail_v2::ProductServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::retail_v2::ProductServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use retail_v2::ProductServiceRetryPolicy directly.
-using ::google::cloud::retail_v2::ProductServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_CONNECTION_H
diff --git a/google/cloud/retail/product_connection_idempotency_policy.h b/google/cloud/retail/product_connection_idempotency_policy.h
deleted file mode 100644
index 705aa99d54e1f..0000000000000
--- a/google/cloud/retail/product_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/product_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/retail/v2/product_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// retail_v2::MakeDefaultProductServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::retail_v2::
-    MakeDefaultProductServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use retail_v2::ProductServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::retail_v2::ProductServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/retail/product_options.h b/google/cloud/retail/product_options.h
deleted file mode 100644
index 06bd5c587992e..0000000000000
--- a/google/cloud/retail/product_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/product_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_OPTIONS_H
-
-#include "google/cloud/retail/product_connection.h"
-#include "google/cloud/retail/product_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/product_options.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::ProductServicePollingPolicyOption directly.
-using ::google::cloud::retail_v2::ProductServicePollingPolicyOption;
-
-/// @deprecated Use retail_v2::ProductServiceBackoffPolicyOption directly.
-using ::google::cloud::retail_v2::ProductServiceBackoffPolicyOption;
-
-/// @deprecated Use retail_v2::ProductServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::retail_v2::
-    ProductServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use retail_v2::ProductServicePolicyOptionList directly.
-using ::google::cloud::retail_v2::ProductServicePolicyOptionList;
-
-/// @deprecated Use retail_v2::ProductServiceRetryPolicyOption directly.
-using ::google::cloud::retail_v2::ProductServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_PRODUCT_OPTIONS_H
diff --git a/google/cloud/retail/search_client.h b/google/cloud/retail/search_client.h
deleted file mode 100644
index 0a44750a43142..0000000000000
--- a/google/cloud/retail/search_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_CLIENT_H
-
-#include "google/cloud/retail/search_connection.h"
-#include "google/cloud/retail/v2/search_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2 instead of the aliases defined in
-///     this namespace.
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::SearchServiceClient directly.
-using ::google::cloud::retail_v2::SearchServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_CLIENT_H
diff --git a/google/cloud/retail/search_connection.h b/google/cloud/retail/search_connection.h
deleted file mode 100644
index 624a9e9335704..0000000000000
--- a/google/cloud/retail/search_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_CONNECTION_H
-
-#include "google/cloud/retail/search_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/search_connection.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::MakeSearchServiceConnection directly.
-using ::google::cloud::retail_v2::MakeSearchServiceConnection;
-
-/// @deprecated Use retail_v2::SearchServiceConnection directly.
-using ::google::cloud::retail_v2::SearchServiceConnection;
-
-/// @deprecated Use retail_v2::SearchServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::retail_v2::SearchServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use retail_v2::SearchServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::retail_v2::SearchServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use retail_v2::SearchServiceRetryPolicy directly.
-using ::google::cloud::retail_v2::SearchServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_CONNECTION_H
diff --git a/google/cloud/retail/search_connection_idempotency_policy.h b/google/cloud/retail/search_connection_idempotency_policy.h
deleted file mode 100644
index 914ef06ea2069..0000000000000
--- a/google/cloud/retail/search_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/retail/v2/search_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// retail_v2::MakeDefaultSearchServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::retail_v2::
-    MakeDefaultSearchServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use retail_v2::SearchServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::retail_v2::SearchServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/retail/search_options.h b/google/cloud/retail/search_options.h
deleted file mode 100644
index 8038e8a370c31..0000000000000
--- a/google/cloud/retail/search_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_OPTIONS_H
-
-#include "google/cloud/retail/search_connection.h"
-#include "google/cloud/retail/search_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/search_options.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::SearchServiceBackoffPolicyOption directly.
-using ::google::cloud::retail_v2::SearchServiceBackoffPolicyOption;
-
-/// @deprecated Use retail_v2::SearchServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::retail_v2::
-    SearchServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use retail_v2::SearchServicePolicyOptionList directly.
-using ::google::cloud::retail_v2::SearchServicePolicyOptionList;
-
-/// @deprecated Use retail_v2::SearchServiceRetryPolicyOption directly.
-using ::google::cloud::retail_v2::SearchServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_SEARCH_OPTIONS_H
diff --git a/google/cloud/retail/user_event_client.h b/google/cloud/retail/user_event_client.h
deleted file mode 100644
index 3a4fdc9832575..0000000000000
--- a/google/cloud/retail/user_event_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/user_event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_CLIENT_H
-
-#include "google/cloud/retail/user_event_connection.h"
-#include "google/cloud/retail/v2/user_event_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in retail_v2 instead of the aliases defined in
-///     this namespace.
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::UserEventServiceClient directly.
-using ::google::cloud::retail_v2::UserEventServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_CLIENT_H
diff --git a/google/cloud/retail/user_event_connection.h b/google/cloud/retail/user_event_connection.h
deleted file mode 100644
index ceca713906525..0000000000000
--- a/google/cloud/retail/user_event_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/user_event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_CONNECTION_H
-
-#include "google/cloud/retail/user_event_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/user_event_connection.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::MakeUserEventServiceConnection directly.
-using ::google::cloud::retail_v2::MakeUserEventServiceConnection;
-
-/// @deprecated Use retail_v2::UserEventServiceConnection directly.
-using ::google::cloud::retail_v2::UserEventServiceConnection;
-
-/// @deprecated Use retail_v2::UserEventServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::retail_v2::UserEventServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use retail_v2::UserEventServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::retail_v2::UserEventServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use retail_v2::UserEventServiceRetryPolicy directly.
-using ::google::cloud::retail_v2::UserEventServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_CONNECTION_H
diff --git a/google/cloud/retail/user_event_connection_idempotency_policy.h b/google/cloud/retail/user_event_connection_idempotency_policy.h
deleted file mode 100644
index cc6f6340482c2..0000000000000
--- a/google/cloud/retail/user_event_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/user_event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/retail/v2/user_event_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// retail_v2::MakeDefaultUserEventServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::retail_v2::
-    MakeDefaultUserEventServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use retail_v2::UserEventServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::retail_v2::UserEventServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/retail/user_event_options.h b/google/cloud/retail/user_event_options.h
deleted file mode 100644
index f385fdc2c8f63..0000000000000
--- a/google/cloud/retail/user_event_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/retail/v2/user_event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_OPTIONS_H
-
-#include "google/cloud/retail/user_event_connection.h"
-#include "google/cloud/retail/user_event_connection_idempotency_policy.h"
-#include "google/cloud/retail/v2/user_event_options.h"
-
-namespace google {
-namespace cloud {
-namespace retail {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use retail_v2::UserEventServicePollingPolicyOption directly.
-using ::google::cloud::retail_v2::UserEventServicePollingPolicyOption;
-
-/// @deprecated Use retail_v2::UserEventServiceBackoffPolicyOption directly.
-using ::google::cloud::retail_v2::UserEventServiceBackoffPolicyOption;
-
-/// @deprecated Use retail_v2::UserEventServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::retail_v2::
-    UserEventServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use retail_v2::UserEventServicePolicyOptionList directly.
-using ::google::cloud::retail_v2::UserEventServicePolicyOptionList;
-
-/// @deprecated Use retail_v2::UserEventServiceRetryPolicyOption directly.
-using ::google::cloud::retail_v2::UserEventServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace retail
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RETAIL_USER_EVENT_OPTIONS_H
diff --git a/google/cloud/run/BUILD.bazel b/google/cloud/run/BUILD.bazel
index 0365a11f7090d..3ef1147c52537 100644
--- a/google/cloud/run/BUILD.bazel
+++ b/google/cloud/run/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v2/",
 ]
 
diff --git a/google/cloud/run/CMakeLists.txt b/google/cloud/run/CMakeLists.txt
index 492207c77a09d..e613ad53b1267 100644
--- a/google/cloud/run/CMakeLists.txt
+++ b/google/cloud/run/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(run "Cloud Run Admin API"
-                                   SERVICE_DIRS "__EMPTY__" "v2/")
+google_cloud_cpp_add_gapic_library(run "Cloud Run Admin API" SERVICE_DIRS "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(run_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/run/mocks/mock_revisions_connection.h b/google/cloud/run/mocks/mock_revisions_connection.h
deleted file mode 100644
index f1f255c55201c..0000000000000
--- a/google/cloud/run/mocks/mock_revisions_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/revision.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_MOCKS_MOCK_REVISIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_MOCKS_MOCK_REVISIONS_CONNECTION_H
-
-#include "google/cloud/run/revisions_connection.h"
-#include "google/cloud/run/v2/mocks/mock_revisions_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in run_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace run_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2_mocks::MockRevisionsConnection directly.
-using ::google::cloud::run_v2_mocks::MockRevisionsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_MOCKS_MOCK_REVISIONS_CONNECTION_H
diff --git a/google/cloud/run/mocks/mock_services_connection.h b/google/cloud/run/mocks/mock_services_connection.h
deleted file mode 100644
index f52e50c67b8a0..0000000000000
--- a/google/cloud/run/mocks/mock_services_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_MOCKS_MOCK_SERVICES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_MOCKS_MOCK_SERVICES_CONNECTION_H
-
-#include "google/cloud/run/services_connection.h"
-#include "google/cloud/run/v2/mocks/mock_services_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in run_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace run_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2_mocks::MockServicesConnection directly.
-using ::google::cloud::run_v2_mocks::MockServicesConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_MOCKS_MOCK_SERVICES_CONNECTION_H
diff --git a/google/cloud/run/revisions_client.h b/google/cloud/run/revisions_client.h
deleted file mode 100644
index cb4b6d8a52b5c..0000000000000
--- a/google/cloud/run/revisions_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/revision.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_CLIENT_H
-
-#include "google/cloud/run/revisions_connection.h"
-#include "google/cloud/run/v2/revisions_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in run_v2 instead of the aliases defined in
-///     this namespace.
-namespace run {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2::RevisionsClient directly.
-using ::google::cloud::run_v2::RevisionsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_CLIENT_H
diff --git a/google/cloud/run/revisions_connection.h b/google/cloud/run/revisions_connection.h
deleted file mode 100644
index abfa5a3291e53..0000000000000
--- a/google/cloud/run/revisions_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/revision.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_CONNECTION_H
-
-#include "google/cloud/run/revisions_connection_idempotency_policy.h"
-#include "google/cloud/run/v2/revisions_connection.h"
-
-namespace google {
-namespace cloud {
-namespace run {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2::MakeRevisionsConnection directly.
-using ::google::cloud::run_v2::MakeRevisionsConnection;
-
-/// @deprecated Use run_v2::RevisionsConnection directly.
-using ::google::cloud::run_v2::RevisionsConnection;
-
-/// @deprecated Use run_v2::RevisionsLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::run_v2::RevisionsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use run_v2::RevisionsLimitedTimeRetryPolicy directly.
-using ::google::cloud::run_v2::RevisionsLimitedTimeRetryPolicy;
-
-/// @deprecated Use run_v2::RevisionsRetryPolicy directly.
-using ::google::cloud::run_v2::RevisionsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_CONNECTION_H
diff --git a/google/cloud/run/revisions_connection_idempotency_policy.h b/google/cloud/run/revisions_connection_idempotency_policy.h
deleted file mode 100644
index 08d87657fe8f2..0000000000000
--- a/google/cloud/run/revisions_connection_idempotency_policy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/revision.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/run/v2/revisions_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace run {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2::MakeDefaultRevisionsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::run_v2::MakeDefaultRevisionsConnectionIdempotencyPolicy;
-
-/// @deprecated Use run_v2::RevisionsConnectionIdempotencyPolicy directly.
-using ::google::cloud::run_v2::RevisionsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/run/revisions_options.h b/google/cloud/run/revisions_options.h
deleted file mode 100644
index 53cb68246b226..0000000000000
--- a/google/cloud/run/revisions_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/revision.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_OPTIONS_H
-
-#include "google/cloud/run/revisions_connection.h"
-#include "google/cloud/run/revisions_connection_idempotency_policy.h"
-#include "google/cloud/run/v2/revisions_options.h"
-
-namespace google {
-namespace cloud {
-namespace run {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2::RevisionsPollingPolicyOption directly.
-using ::google::cloud::run_v2::RevisionsPollingPolicyOption;
-
-/// @deprecated Use run_v2::RevisionsBackoffPolicyOption directly.
-using ::google::cloud::run_v2::RevisionsBackoffPolicyOption;
-
-/// @deprecated Use run_v2::RevisionsConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::run_v2::RevisionsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use run_v2::RevisionsPolicyOptionList directly.
-using ::google::cloud::run_v2::RevisionsPolicyOptionList;
-
-/// @deprecated Use run_v2::RevisionsRetryPolicyOption directly.
-using ::google::cloud::run_v2::RevisionsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_REVISIONS_OPTIONS_H
diff --git a/google/cloud/run/services_client.h b/google/cloud/run/services_client.h
deleted file mode 100644
index 91ef2016a2218..0000000000000
--- a/google/cloud/run/services_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_CLIENT_H
-
-#include "google/cloud/run/services_connection.h"
-#include "google/cloud/run/v2/services_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in run_v2 instead of the aliases defined in
-///     this namespace.
-namespace run {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2::ServicesClient directly.
-using ::google::cloud::run_v2::ServicesClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_CLIENT_H
diff --git a/google/cloud/run/services_connection.h b/google/cloud/run/services_connection.h
deleted file mode 100644
index 9793b2f0a2a70..0000000000000
--- a/google/cloud/run/services_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_CONNECTION_H
-
-#include "google/cloud/run/services_connection_idempotency_policy.h"
-#include "google/cloud/run/v2/services_connection.h"
-
-namespace google {
-namespace cloud {
-namespace run {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2::MakeServicesConnection directly.
-using ::google::cloud::run_v2::MakeServicesConnection;
-
-/// @deprecated Use run_v2::ServicesConnection directly.
-using ::google::cloud::run_v2::ServicesConnection;
-
-/// @deprecated Use run_v2::ServicesLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::run_v2::ServicesLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use run_v2::ServicesLimitedTimeRetryPolicy directly.
-using ::google::cloud::run_v2::ServicesLimitedTimeRetryPolicy;
-
-/// @deprecated Use run_v2::ServicesRetryPolicy directly.
-using ::google::cloud::run_v2::ServicesRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_CONNECTION_H
diff --git a/google/cloud/run/services_connection_idempotency_policy.h b/google/cloud/run/services_connection_idempotency_policy.h
deleted file mode 100644
index 976cb3a476a06..0000000000000
--- a/google/cloud/run/services_connection_idempotency_policy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/run/v2/services_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace run {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2::MakeDefaultServicesConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::run_v2::MakeDefaultServicesConnectionIdempotencyPolicy;
-
-/// @deprecated Use run_v2::ServicesConnectionIdempotencyPolicy directly.
-using ::google::cloud::run_v2::ServicesConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/run/services_options.h b/google/cloud/run/services_options.h
deleted file mode 100644
index 21e2ca6d83ef4..0000000000000
--- a/google/cloud/run/services_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/run/v2/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_OPTIONS_H
-
-#include "google/cloud/run/services_connection.h"
-#include "google/cloud/run/services_connection_idempotency_policy.h"
-#include "google/cloud/run/v2/services_options.h"
-
-namespace google {
-namespace cloud {
-namespace run {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use run_v2::ServicesPollingPolicyOption directly.
-using ::google::cloud::run_v2::ServicesPollingPolicyOption;
-
-/// @deprecated Use run_v2::ServicesBackoffPolicyOption directly.
-using ::google::cloud::run_v2::ServicesBackoffPolicyOption;
-
-/// @deprecated Use run_v2::ServicesConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::run_v2::ServicesConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use run_v2::ServicesPolicyOptionList directly.
-using ::google::cloud::run_v2::ServicesPolicyOptionList;
-
-/// @deprecated Use run_v2::ServicesRetryPolicyOption directly.
-using ::google::cloud::run_v2::ServicesRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace run
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RUN_SERVICES_OPTIONS_H
diff --git a/google/cloud/scheduler/BUILD.bazel b/google/cloud/scheduler/BUILD.bazel
index 345f4af0aeaea..8e5563c0aa22d 100644
--- a/google/cloud/scheduler/BUILD.bazel
+++ b/google/cloud/scheduler/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/scheduler/CMakeLists.txt b/google/cloud/scheduler/CMakeLists.txt
index 1c268d72d837e..90079925e16c8 100644
--- a/google/cloud/scheduler/CMakeLists.txt
+++ b/google/cloud/scheduler/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(scheduler "Cloud Scheduler API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(scheduler_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/scheduler/cloud_scheduler_client.h b/google/cloud/scheduler/cloud_scheduler_client.h
deleted file mode 100644
index b75103311946c..0000000000000
--- a/google/cloud/scheduler/cloud_scheduler_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/scheduler/v1/cloudscheduler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_CLIENT_H
-
-#include "google/cloud/scheduler/cloud_scheduler_connection.h"
-#include "google/cloud/scheduler/v1/cloud_scheduler_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in scheduler_v1 instead of the aliases defined in
-///     this namespace.
-namespace scheduler {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use scheduler_v1::CloudSchedulerClient directly.
-using ::google::cloud::scheduler_v1::CloudSchedulerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace scheduler
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_CLIENT_H
diff --git a/google/cloud/scheduler/cloud_scheduler_connection.h b/google/cloud/scheduler/cloud_scheduler_connection.h
deleted file mode 100644
index 0960cafbd3b52..0000000000000
--- a/google/cloud/scheduler/cloud_scheduler_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/scheduler/v1/cloudscheduler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_CONNECTION_H
-
-#include "google/cloud/scheduler/cloud_scheduler_connection_idempotency_policy.h"
-#include "google/cloud/scheduler/v1/cloud_scheduler_connection.h"
-
-namespace google {
-namespace cloud {
-namespace scheduler {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use scheduler_v1::MakeCloudSchedulerConnection directly.
-using ::google::cloud::scheduler_v1::MakeCloudSchedulerConnection;
-
-/// @deprecated Use scheduler_v1::CloudSchedulerConnection directly.
-using ::google::cloud::scheduler_v1::CloudSchedulerConnection;
-
-/// @deprecated Use scheduler_v1::CloudSchedulerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::scheduler_v1::CloudSchedulerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use scheduler_v1::CloudSchedulerLimitedTimeRetryPolicy directly.
-using ::google::cloud::scheduler_v1::CloudSchedulerLimitedTimeRetryPolicy;
-
-/// @deprecated Use scheduler_v1::CloudSchedulerRetryPolicy directly.
-using ::google::cloud::scheduler_v1::CloudSchedulerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace scheduler
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_CONNECTION_H
diff --git a/google/cloud/scheduler/cloud_scheduler_connection_idempotency_policy.h b/google/cloud/scheduler/cloud_scheduler_connection_idempotency_policy.h
deleted file mode 100644
index 74485af20aa5e..0000000000000
--- a/google/cloud/scheduler/cloud_scheduler_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/scheduler/v1/cloudscheduler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/scheduler/v1/cloud_scheduler_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace scheduler {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// scheduler_v1::MakeDefaultCloudSchedulerConnectionIdempotencyPolicy directly.
-using ::google::cloud::scheduler_v1::
-    MakeDefaultCloudSchedulerConnectionIdempotencyPolicy;
-
-/// @deprecated Use scheduler_v1::CloudSchedulerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::scheduler_v1::CloudSchedulerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace scheduler
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/scheduler/cloud_scheduler_options.h b/google/cloud/scheduler/cloud_scheduler_options.h
deleted file mode 100644
index ecc0a4d9823e3..0000000000000
--- a/google/cloud/scheduler/cloud_scheduler_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/scheduler/v1/cloudscheduler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_OPTIONS_H
-
-#include "google/cloud/scheduler/cloud_scheduler_connection.h"
-#include "google/cloud/scheduler/cloud_scheduler_connection_idempotency_policy.h"
-#include "google/cloud/scheduler/v1/cloud_scheduler_options.h"
-
-namespace google {
-namespace cloud {
-namespace scheduler {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use scheduler_v1::CloudSchedulerBackoffPolicyOption directly.
-using ::google::cloud::scheduler_v1::CloudSchedulerBackoffPolicyOption;
-
-/// @deprecated Use
-/// scheduler_v1::CloudSchedulerConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::scheduler_v1::
-    CloudSchedulerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use scheduler_v1::CloudSchedulerPolicyOptionList directly.
-using ::google::cloud::scheduler_v1::CloudSchedulerPolicyOptionList;
-
-/// @deprecated Use scheduler_v1::CloudSchedulerRetryPolicyOption directly.
-using ::google::cloud::scheduler_v1::CloudSchedulerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace scheduler
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_CLOUD_SCHEDULER_OPTIONS_H
diff --git a/google/cloud/scheduler/mocks/mock_cloud_scheduler_connection.h b/google/cloud/scheduler/mocks/mock_cloud_scheduler_connection.h
deleted file mode 100644
index 9aa74e412cd85..0000000000000
--- a/google/cloud/scheduler/mocks/mock_cloud_scheduler_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/scheduler/v1/cloudscheduler.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_MOCKS_MOCK_CLOUD_SCHEDULER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_MOCKS_MOCK_CLOUD_SCHEDULER_CONNECTION_H
-
-#include "google/cloud/scheduler/cloud_scheduler_connection.h"
-#include "google/cloud/scheduler/v1/mocks/mock_cloud_scheduler_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in scheduler_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace scheduler_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use scheduler_v1_mocks::MockCloudSchedulerConnection directly.
-using ::google::cloud::scheduler_v1_mocks::MockCloudSchedulerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace scheduler_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SCHEDULER_MOCKS_MOCK_CLOUD_SCHEDULER_CONNECTION_H
diff --git a/google/cloud/secretmanager/BUILD.bazel b/google/cloud/secretmanager/BUILD.bazel
index 7000afebeaa96..5026b4341582a 100644
--- a/google/cloud/secretmanager/BUILD.bazel
+++ b/google/cloud/secretmanager/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/secretmanager/CMakeLists.txt b/google/cloud/secretmanager/CMakeLists.txt
index 0ba0333c787c9..bad61df6b0779 100644
--- a/google/cloud/secretmanager/CMakeLists.txt
+++ b/google/cloud/secretmanager/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(secretmanager "Secret Manager API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(secretmanager_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/secretmanager/mocks/mock_secret_manager_connection.h b/google/cloud/secretmanager/mocks/mock_secret_manager_connection.h
deleted file mode 100644
index ea1fb8e45d164..0000000000000
--- a/google/cloud/secretmanager/mocks/mock_secret_manager_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/secretmanager/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_MOCKS_MOCK_SECRET_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_MOCKS_MOCK_SECRET_MANAGER_CONNECTION_H
-
-#include "google/cloud/secretmanager/secret_manager_connection.h"
-#include "google/cloud/secretmanager/v1/mocks/mock_secret_manager_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in secretmanager_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace secretmanager_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use secretmanager_v1_mocks::MockSecretManagerServiceConnection
-/// directly.
-using ::google::cloud::secretmanager_v1_mocks::
-    MockSecretManagerServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace secretmanager_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_MOCKS_MOCK_SECRET_MANAGER_CONNECTION_H
diff --git a/google/cloud/secretmanager/secret_manager_client.h b/google/cloud/secretmanager/secret_manager_client.h
deleted file mode 100644
index 1d9e79f474263..0000000000000
--- a/google/cloud/secretmanager/secret_manager_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/secretmanager/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_CLIENT_H
-
-#include "google/cloud/secretmanager/secret_manager_connection.h"
-#include "google/cloud/secretmanager/v1/secret_manager_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in secretmanager_v1 instead of the aliases defined in
-///     this namespace.
-namespace secretmanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use secretmanager_v1::SecretManagerServiceClient directly.
-using ::google::cloud::secretmanager_v1::SecretManagerServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace secretmanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_CLIENT_H
diff --git a/google/cloud/secretmanager/secret_manager_connection.h b/google/cloud/secretmanager/secret_manager_connection.h
deleted file mode 100644
index d52e9c613572f..0000000000000
--- a/google/cloud/secretmanager/secret_manager_connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/secretmanager/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_CONNECTION_H
-
-#include "google/cloud/secretmanager/secret_manager_connection_idempotency_policy.h"
-#include "google/cloud/secretmanager/v1/secret_manager_connection.h"
-
-namespace google {
-namespace cloud {
-namespace secretmanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use secretmanager_v1::MakeSecretManagerServiceConnection
-/// directly.
-using ::google::cloud::secretmanager_v1::MakeSecretManagerServiceConnection;
-
-/// @deprecated Use secretmanager_v1::SecretManagerServiceConnection directly.
-using ::google::cloud::secretmanager_v1::SecretManagerServiceConnection;
-
-/// @deprecated Use
-/// secretmanager_v1::SecretManagerServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::secretmanager_v1::
-    SecretManagerServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use secretmanager_v1::SecretManagerServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::secretmanager_v1::
-    SecretManagerServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use secretmanager_v1::SecretManagerServiceRetryPolicy directly.
-using ::google::cloud::secretmanager_v1::SecretManagerServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace secretmanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_CONNECTION_H
diff --git a/google/cloud/secretmanager/secret_manager_connection_idempotency_policy.h b/google/cloud/secretmanager/secret_manager_connection_idempotency_policy.h
deleted file mode 100644
index 35a3e6fdb0ec9..0000000000000
--- a/google/cloud/secretmanager/secret_manager_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/secretmanager/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/secretmanager/v1/secret_manager_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace secretmanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// secretmanager_v1::MakeDefaultSecretManagerServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::secretmanager_v1::
-    MakeDefaultSecretManagerServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// secretmanager_v1::SecretManagerServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::secretmanager_v1::
-    SecretManagerServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace secretmanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/secretmanager/secret_manager_options.h b/google/cloud/secretmanager/secret_manager_options.h
deleted file mode 100644
index c92b9a8384ce4..0000000000000
--- a/google/cloud/secretmanager/secret_manager_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/secretmanager/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_OPTIONS_H
-
-#include "google/cloud/secretmanager/secret_manager_connection.h"
-#include "google/cloud/secretmanager/secret_manager_connection_idempotency_policy.h"
-#include "google/cloud/secretmanager/v1/secret_manager_options.h"
-
-namespace google {
-namespace cloud {
-namespace secretmanager {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use secretmanager_v1::SecretManagerServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::secretmanager_v1::
-    SecretManagerServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// secretmanager_v1::SecretManagerServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::secretmanager_v1::
-    SecretManagerServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use secretmanager_v1::SecretManagerServicePolicyOptionList
-/// directly.
-using ::google::cloud::secretmanager_v1::SecretManagerServicePolicyOptionList;
-
-/// @deprecated Use secretmanager_v1::SecretManagerServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::secretmanager_v1::SecretManagerServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace secretmanager
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECRETMANAGER_SECRET_MANAGER_OPTIONS_H
diff --git a/google/cloud/securitycenter/BUILD.bazel b/google/cloud/securitycenter/BUILD.bazel
index 8f6f48d0a3d81..71b679464b08e 100644
--- a/google/cloud/securitycenter/BUILD.bazel
+++ b/google/cloud/securitycenter/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "v2/",
 ]
diff --git a/google/cloud/securitycenter/CMakeLists.txt b/google/cloud/securitycenter/CMakeLists.txt
index cd333a293591f..d9234b4a91d4a 100644
--- a/google/cloud/securitycenter/CMakeLists.txt
+++ b/google/cloud/securitycenter/CMakeLists.txt
@@ -25,7 +25,7 @@ endif ()
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(securitycenter "Security Command Center API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/" "v2/")
+                                   SERVICE_DIRS "v1/" "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(securitycenter_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/securitycenter/mocks/mock_security_center_connection.h b/google/cloud/securitycenter/mocks/mock_security_center_connection.h
deleted file mode 100644
index e112e09a05ee6..0000000000000
--- a/google/cloud/securitycenter/mocks/mock_security_center_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/securitycenter/v1/securitycenter_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_MOCKS_MOCK_SECURITY_CENTER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_MOCKS_MOCK_SECURITY_CENTER_CONNECTION_H
-
-#include "google/cloud/securitycenter/security_center_connection.h"
-#include "google/cloud/securitycenter/v1/mocks/mock_security_center_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in securitycenter_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace securitycenter_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use securitycenter_v1_mocks::MockSecurityCenterConnection
-/// directly.
-using ::google::cloud::securitycenter_v1_mocks::MockSecurityCenterConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace securitycenter_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_MOCKS_MOCK_SECURITY_CENTER_CONNECTION_H
diff --git a/google/cloud/securitycenter/security_center_client.h b/google/cloud/securitycenter/security_center_client.h
deleted file mode 100644
index bde60f1a5fb35..0000000000000
--- a/google/cloud/securitycenter/security_center_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/securitycenter/v1/securitycenter_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CLIENT_H
-
-#include "google/cloud/securitycenter/security_center_connection.h"
-#include "google/cloud/securitycenter/v1/security_center_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in securitycenter_v1 instead of the aliases defined in
-///     this namespace.
-namespace securitycenter {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use securitycenter_v1::SecurityCenterClient directly.
-using ::google::cloud::securitycenter_v1::SecurityCenterClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace securitycenter
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CLIENT_H
diff --git a/google/cloud/securitycenter/security_center_connection.h b/google/cloud/securitycenter/security_center_connection.h
deleted file mode 100644
index 2f486ce428039..0000000000000
--- a/google/cloud/securitycenter/security_center_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/securitycenter/v1/securitycenter_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_H
-
-#include "google/cloud/securitycenter/security_center_connection_idempotency_policy.h"
-#include "google/cloud/securitycenter/v1/security_center_connection.h"
-
-namespace google {
-namespace cloud {
-namespace securitycenter {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use securitycenter_v1::MakeSecurityCenterConnection directly.
-using ::google::cloud::securitycenter_v1::MakeSecurityCenterConnection;
-
-/// @deprecated Use securitycenter_v1::SecurityCenterConnection directly.
-using ::google::cloud::securitycenter_v1::SecurityCenterConnection;
-
-/// @deprecated Use
-/// securitycenter_v1::SecurityCenterLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::securitycenter_v1::
-    SecurityCenterLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use securitycenter_v1::SecurityCenterLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::securitycenter_v1::SecurityCenterLimitedTimeRetryPolicy;
-
-/// @deprecated Use securitycenter_v1::SecurityCenterRetryPolicy directly.
-using ::google::cloud::securitycenter_v1::SecurityCenterRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace securitycenter
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_H
diff --git a/google/cloud/securitycenter/security_center_connection_idempotency_policy.h b/google/cloud/securitycenter/security_center_connection_idempotency_policy.h
deleted file mode 100644
index 9833b79f95ca0..0000000000000
--- a/google/cloud/securitycenter/security_center_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/securitycenter/v1/securitycenter_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace securitycenter {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// securitycenter_v1::MakeDefaultSecurityCenterConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::securitycenter_v1::
-    MakeDefaultSecurityCenterConnectionIdempotencyPolicy;
-
-/// @deprecated Use securitycenter_v1::SecurityCenterConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::securitycenter_v1::
-    SecurityCenterConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace securitycenter
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/securitycenter/security_center_options.h b/google/cloud/securitycenter/security_center_options.h
deleted file mode 100644
index ddaa3e59fcc3e..0000000000000
--- a/google/cloud/securitycenter/security_center_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/securitycenter/v1/securitycenter_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_OPTIONS_H
-
-#include "google/cloud/securitycenter/security_center_connection.h"
-#include "google/cloud/securitycenter/security_center_connection_idempotency_policy.h"
-#include "google/cloud/securitycenter/v1/security_center_options.h"
-
-namespace google {
-namespace cloud {
-namespace securitycenter {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use securitycenter_v1::SecurityCenterPollingPolicyOption
-/// directly.
-using ::google::cloud::securitycenter_v1::SecurityCenterPollingPolicyOption;
-
-/// @deprecated Use securitycenter_v1::SecurityCenterBackoffPolicyOption
-/// directly.
-using ::google::cloud::securitycenter_v1::SecurityCenterBackoffPolicyOption;
-
-/// @deprecated Use
-/// securitycenter_v1::SecurityCenterConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::securitycenter_v1::
-    SecurityCenterConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use securitycenter_v1::SecurityCenterPolicyOptionList directly.
-using ::google::cloud::securitycenter_v1::SecurityCenterPolicyOptionList;
-
-/// @deprecated Use securitycenter_v1::SecurityCenterRetryPolicyOption directly.
-using ::google::cloud::securitycenter_v1::SecurityCenterRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace securitycenter
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_OPTIONS_H
diff --git a/google/cloud/servicecontrol/BUILD.bazel b/google/cloud/servicecontrol/BUILD.bazel
index adad8f0e31e89..7e4932e01f526 100644
--- a/google/cloud/servicecontrol/BUILD.bazel
+++ b/google/cloud/servicecontrol/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "v2/",
 ]
diff --git a/google/cloud/servicecontrol/CMakeLists.txt b/google/cloud/servicecontrol/CMakeLists.txt
index 1de3dd070c93c..1ef6771458560 100644
--- a/google/cloud/servicecontrol/CMakeLists.txt
+++ b/google/cloud/servicecontrol/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     servicecontrol "Service Control API"
-    SERVICE_DIRS "__EMPTY__" "v1/" "v2/"
+    SERVICE_DIRS "v1/" "v2/"
     SHARED_PROTO_DEPS "logging_type")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
diff --git a/google/cloud/servicecontrol/mocks/mock_quota_controller_connection.h b/google/cloud/servicecontrol/mocks/mock_quota_controller_connection.h
deleted file mode 100644
index 66a53c09a492f..0000000000000
--- a/google/cloud/servicecontrol/mocks/mock_quota_controller_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/quota_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_MOCKS_MOCK_QUOTA_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_MOCKS_MOCK_QUOTA_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/servicecontrol/quota_controller_connection.h"
-#include "google/cloud/servicecontrol/v1/mocks/mock_quota_controller_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicecontrol_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace servicecontrol_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicecontrol_v1_mocks::MockQuotaControllerConnection
-/// directly.
-using ::google::cloud::servicecontrol_v1_mocks::MockQuotaControllerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_MOCKS_MOCK_QUOTA_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/servicecontrol/mocks/mock_service_controller_connection.h b/google/cloud/servicecontrol/mocks/mock_service_controller_connection.h
deleted file mode 100644
index f2be921e7aae5..0000000000000
--- a/google/cloud/servicecontrol/mocks/mock_service_controller_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/service_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_MOCKS_MOCK_SERVICE_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_MOCKS_MOCK_SERVICE_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/servicecontrol/service_controller_connection.h"
-#include "google/cloud/servicecontrol/v1/mocks/mock_service_controller_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicecontrol_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace servicecontrol_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicecontrol_v1_mocks::MockServiceControllerConnection
-/// directly.
-using ::google::cloud::servicecontrol_v1_mocks::MockServiceControllerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_MOCKS_MOCK_SERVICE_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/servicecontrol/quota_controller_client.h b/google/cloud/servicecontrol/quota_controller_client.h
deleted file mode 100644
index f9232cc134f04..0000000000000
--- a/google/cloud/servicecontrol/quota_controller_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/quota_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_CLIENT_H
-
-#include "google/cloud/servicecontrol/quota_controller_connection.h"
-#include "google/cloud/servicecontrol/v1/quota_controller_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicecontrol_v1 instead of the aliases defined in
-///     this namespace.
-namespace servicecontrol {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicecontrol_v1::QuotaControllerClient directly.
-using ::google::cloud::servicecontrol_v1::QuotaControllerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_CLIENT_H
diff --git a/google/cloud/servicecontrol/quota_controller_connection.h b/google/cloud/servicecontrol/quota_controller_connection.h
deleted file mode 100644
index 2e4bf51ca4e15..0000000000000
--- a/google/cloud/servicecontrol/quota_controller_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/quota_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/servicecontrol/quota_controller_connection_idempotency_policy.h"
-#include "google/cloud/servicecontrol/v1/quota_controller_connection.h"
-
-namespace google {
-namespace cloud {
-namespace servicecontrol {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicecontrol_v1::MakeQuotaControllerConnection directly.
-using ::google::cloud::servicecontrol_v1::MakeQuotaControllerConnection;
-
-/// @deprecated Use servicecontrol_v1::QuotaControllerConnection directly.
-using ::google::cloud::servicecontrol_v1::QuotaControllerConnection;
-
-/// @deprecated Use
-/// servicecontrol_v1::QuotaControllerLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::servicecontrol_v1::
-    QuotaControllerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use servicecontrol_v1::QuotaControllerLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::servicecontrol_v1::QuotaControllerLimitedTimeRetryPolicy;
-
-/// @deprecated Use servicecontrol_v1::QuotaControllerRetryPolicy directly.
-using ::google::cloud::servicecontrol_v1::QuotaControllerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/servicecontrol/quota_controller_connection_idempotency_policy.h b/google/cloud/servicecontrol/quota_controller_connection_idempotency_policy.h
deleted file mode 100644
index 6057a64f04029..0000000000000
--- a/google/cloud/servicecontrol/quota_controller_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/quota_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/servicecontrol/v1/quota_controller_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace servicecontrol {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// servicecontrol_v1::MakeDefaultQuotaControllerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::servicecontrol_v1::
-    MakeDefaultQuotaControllerConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// servicecontrol_v1::QuotaControllerConnectionIdempotencyPolicy directly.
-using ::google::cloud::servicecontrol_v1::
-    QuotaControllerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/servicecontrol/quota_controller_options.h b/google/cloud/servicecontrol/quota_controller_options.h
deleted file mode 100644
index 57163ffd6b3a9..0000000000000
--- a/google/cloud/servicecontrol/quota_controller_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/quota_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_OPTIONS_H
-
-#include "google/cloud/servicecontrol/quota_controller_connection.h"
-#include "google/cloud/servicecontrol/quota_controller_connection_idempotency_policy.h"
-#include "google/cloud/servicecontrol/v1/quota_controller_options.h"
-
-namespace google {
-namespace cloud {
-namespace servicecontrol {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicecontrol_v1::QuotaControllerBackoffPolicyOption
-/// directly.
-using ::google::cloud::servicecontrol_v1::QuotaControllerBackoffPolicyOption;
-
-/// @deprecated Use
-/// servicecontrol_v1::QuotaControllerConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::servicecontrol_v1::
-    QuotaControllerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use servicecontrol_v1::QuotaControllerPolicyOptionList directly.
-using ::google::cloud::servicecontrol_v1::QuotaControllerPolicyOptionList;
-
-/// @deprecated Use servicecontrol_v1::QuotaControllerRetryPolicyOption
-/// directly.
-using ::google::cloud::servicecontrol_v1::QuotaControllerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_QUOTA_CONTROLLER_OPTIONS_H
diff --git a/google/cloud/servicecontrol/service_controller_client.h b/google/cloud/servicecontrol/service_controller_client.h
deleted file mode 100644
index de75e6543334d..0000000000000
--- a/google/cloud/servicecontrol/service_controller_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/service_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_CLIENT_H
-
-#include "google/cloud/servicecontrol/service_controller_connection.h"
-#include "google/cloud/servicecontrol/v1/service_controller_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicecontrol_v1 instead of the aliases defined in
-///     this namespace.
-namespace servicecontrol {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicecontrol_v1::ServiceControllerClient directly.
-using ::google::cloud::servicecontrol_v1::ServiceControllerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_CLIENT_H
diff --git a/google/cloud/servicecontrol/service_controller_connection.h b/google/cloud/servicecontrol/service_controller_connection.h
deleted file mode 100644
index 28f05228809d9..0000000000000
--- a/google/cloud/servicecontrol/service_controller_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/service_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_CONNECTION_H
-
-#include "google/cloud/servicecontrol/service_controller_connection_idempotency_policy.h"
-#include "google/cloud/servicecontrol/v1/service_controller_connection.h"
-
-namespace google {
-namespace cloud {
-namespace servicecontrol {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicecontrol_v1::MakeServiceControllerConnection directly.
-using ::google::cloud::servicecontrol_v1::MakeServiceControllerConnection;
-
-/// @deprecated Use servicecontrol_v1::ServiceControllerConnection directly.
-using ::google::cloud::servicecontrol_v1::ServiceControllerConnection;
-
-/// @deprecated Use
-/// servicecontrol_v1::ServiceControllerLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::servicecontrol_v1::
-    ServiceControllerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use servicecontrol_v1::ServiceControllerLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::servicecontrol_v1::
-    ServiceControllerLimitedTimeRetryPolicy;
-
-/// @deprecated Use servicecontrol_v1::ServiceControllerRetryPolicy directly.
-using ::google::cloud::servicecontrol_v1::ServiceControllerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_CONNECTION_H
diff --git a/google/cloud/servicecontrol/service_controller_connection_idempotency_policy.h b/google/cloud/servicecontrol/service_controller_connection_idempotency_policy.h
deleted file mode 100644
index e91ab5a25823f..0000000000000
--- a/google/cloud/servicecontrol/service_controller_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/service_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/servicecontrol/v1/service_controller_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace servicecontrol {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// servicecontrol_v1::MakeDefaultServiceControllerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::servicecontrol_v1::
-    MakeDefaultServiceControllerConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// servicecontrol_v1::ServiceControllerConnectionIdempotencyPolicy directly.
-using ::google::cloud::servicecontrol_v1::
-    ServiceControllerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/servicecontrol/service_controller_options.h b/google/cloud/servicecontrol/service_controller_options.h
deleted file mode 100644
index 70ef1613e5ea1..0000000000000
--- a/google/cloud/servicecontrol/service_controller_options.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicecontrol/v1/service_controller.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_OPTIONS_H
-
-#include "google/cloud/servicecontrol/service_controller_connection.h"
-#include "google/cloud/servicecontrol/service_controller_connection_idempotency_policy.h"
-#include "google/cloud/servicecontrol/v1/service_controller_options.h"
-
-namespace google {
-namespace cloud {
-namespace servicecontrol {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicecontrol_v1::ServiceControllerBackoffPolicyOption
-/// directly.
-using ::google::cloud::servicecontrol_v1::ServiceControllerBackoffPolicyOption;
-
-/// @deprecated Use
-/// servicecontrol_v1::ServiceControllerConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::servicecontrol_v1::
-    ServiceControllerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use servicecontrol_v1::ServiceControllerPolicyOptionList
-/// directly.
-using ::google::cloud::servicecontrol_v1::ServiceControllerPolicyOptionList;
-
-/// @deprecated Use servicecontrol_v1::ServiceControllerRetryPolicyOption
-/// directly.
-using ::google::cloud::servicecontrol_v1::ServiceControllerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicecontrol
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICECONTROL_SERVICE_CONTROLLER_OPTIONS_H
diff --git a/google/cloud/servicedirectory/BUILD.bazel b/google/cloud/servicedirectory/BUILD.bazel
index f08c64ab8531c..473496754c24a 100644
--- a/google/cloud/servicedirectory/BUILD.bazel
+++ b/google/cloud/servicedirectory/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/servicedirectory/CMakeLists.txt b/google/cloud/servicedirectory/CMakeLists.txt
index 4861598ac3b95..fc364b620f381 100644
--- a/google/cloud/servicedirectory/CMakeLists.txt
+++ b/google/cloud/servicedirectory/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(servicedirectory "Service Directory API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(servicedirectory_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/servicedirectory/lookup_client.h b/google/cloud/servicedirectory/lookup_client.h
deleted file mode 100644
index d26129ca8d0fe..0000000000000
--- a/google/cloud/servicedirectory/lookup_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/lookup_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_CLIENT_H
-
-#include "google/cloud/servicedirectory/lookup_connection.h"
-#include "google/cloud/servicedirectory/v1/lookup_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicedirectory_v1 instead of the aliases defined in
-///     this namespace.
-namespace servicedirectory {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicedirectory_v1::LookupServiceClient directly.
-using ::google::cloud::servicedirectory_v1::LookupServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_CLIENT_H
diff --git a/google/cloud/servicedirectory/lookup_connection.h b/google/cloud/servicedirectory/lookup_connection.h
deleted file mode 100644
index e60ca6d18bf08..0000000000000
--- a/google/cloud/servicedirectory/lookup_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/lookup_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_CONNECTION_H
-
-#include "google/cloud/servicedirectory/lookup_connection_idempotency_policy.h"
-#include "google/cloud/servicedirectory/v1/lookup_connection.h"
-
-namespace google {
-namespace cloud {
-namespace servicedirectory {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicedirectory_v1::MakeLookupServiceConnection directly.
-using ::google::cloud::servicedirectory_v1::MakeLookupServiceConnection;
-
-/// @deprecated Use servicedirectory_v1::LookupServiceConnection directly.
-using ::google::cloud::servicedirectory_v1::LookupServiceConnection;
-
-/// @deprecated Use
-/// servicedirectory_v1::LookupServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::servicedirectory_v1::
-    LookupServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use servicedirectory_v1::LookupServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::servicedirectory_v1::LookupServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use servicedirectory_v1::LookupServiceRetryPolicy directly.
-using ::google::cloud::servicedirectory_v1::LookupServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_CONNECTION_H
diff --git a/google/cloud/servicedirectory/lookup_connection_idempotency_policy.h b/google/cloud/servicedirectory/lookup_connection_idempotency_policy.h
deleted file mode 100644
index f537ff0639191..0000000000000
--- a/google/cloud/servicedirectory/lookup_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/lookup_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/servicedirectory/v1/lookup_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace servicedirectory {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// servicedirectory_v1::MakeDefaultLookupServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::servicedirectory_v1::
-    MakeDefaultLookupServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// servicedirectory_v1::LookupServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::servicedirectory_v1::
-    LookupServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/servicedirectory/lookup_options.h b/google/cloud/servicedirectory/lookup_options.h
deleted file mode 100644
index 468dda7ffb66a..0000000000000
--- a/google/cloud/servicedirectory/lookup_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/lookup_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_OPTIONS_H
-
-#include "google/cloud/servicedirectory/lookup_connection.h"
-#include "google/cloud/servicedirectory/lookup_connection_idempotency_policy.h"
-#include "google/cloud/servicedirectory/v1/lookup_options.h"
-
-namespace google {
-namespace cloud {
-namespace servicedirectory {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicedirectory_v1::LookupServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::servicedirectory_v1::LookupServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// servicedirectory_v1::LookupServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::servicedirectory_v1::
-    LookupServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use servicedirectory_v1::LookupServicePolicyOptionList directly.
-using ::google::cloud::servicedirectory_v1::LookupServicePolicyOptionList;
-
-/// @deprecated Use servicedirectory_v1::LookupServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::servicedirectory_v1::LookupServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_LOOKUP_OPTIONS_H
diff --git a/google/cloud/servicedirectory/mocks/mock_lookup_connection.h b/google/cloud/servicedirectory/mocks/mock_lookup_connection.h
deleted file mode 100644
index 8e7880975ed62..0000000000000
--- a/google/cloud/servicedirectory/mocks/mock_lookup_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/lookup_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_MOCKS_MOCK_LOOKUP_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_MOCKS_MOCK_LOOKUP_CONNECTION_H
-
-#include "google/cloud/servicedirectory/lookup_connection.h"
-#include "google/cloud/servicedirectory/v1/mocks/mock_lookup_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicedirectory_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace servicedirectory_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicedirectory_v1_mocks::MockLookupServiceConnection
-/// directly.
-using ::google::cloud::servicedirectory_v1_mocks::MockLookupServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_MOCKS_MOCK_LOOKUP_CONNECTION_H
diff --git a/google/cloud/servicedirectory/mocks/mock_registration_connection.h b/google/cloud/servicedirectory/mocks/mock_registration_connection.h
deleted file mode 100644
index f36f104522107..0000000000000
--- a/google/cloud/servicedirectory/mocks/mock_registration_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/registration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_MOCKS_MOCK_REGISTRATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_MOCKS_MOCK_REGISTRATION_CONNECTION_H
-
-#include "google/cloud/servicedirectory/registration_connection.h"
-#include "google/cloud/servicedirectory/v1/mocks/mock_registration_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicedirectory_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace servicedirectory_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicedirectory_v1_mocks::MockRegistrationServiceConnection
-/// directly.
-using ::google::cloud::servicedirectory_v1_mocks::
-    MockRegistrationServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_MOCKS_MOCK_REGISTRATION_CONNECTION_H
diff --git a/google/cloud/servicedirectory/registration_client.h b/google/cloud/servicedirectory/registration_client.h
deleted file mode 100644
index fe2d2dd67c85c..0000000000000
--- a/google/cloud/servicedirectory/registration_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/registration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_CLIENT_H
-
-#include "google/cloud/servicedirectory/registration_connection.h"
-#include "google/cloud/servicedirectory/v1/registration_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicedirectory_v1 instead of the aliases defined in
-///     this namespace.
-namespace servicedirectory {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicedirectory_v1::RegistrationServiceClient directly.
-using ::google::cloud::servicedirectory_v1::RegistrationServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_CLIENT_H
diff --git a/google/cloud/servicedirectory/registration_connection.h b/google/cloud/servicedirectory/registration_connection.h
deleted file mode 100644
index 8370f825bcf23..0000000000000
--- a/google/cloud/servicedirectory/registration_connection.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/registration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_CONNECTION_H
-
-#include "google/cloud/servicedirectory/registration_connection_idempotency_policy.h"
-#include "google/cloud/servicedirectory/v1/registration_connection.h"
-
-namespace google {
-namespace cloud {
-namespace servicedirectory {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicedirectory_v1::MakeRegistrationServiceConnection
-/// directly.
-using ::google::cloud::servicedirectory_v1::MakeRegistrationServiceConnection;
-
-/// @deprecated Use servicedirectory_v1::RegistrationServiceConnection directly.
-using ::google::cloud::servicedirectory_v1::RegistrationServiceConnection;
-
-/// @deprecated Use
-/// servicedirectory_v1::RegistrationServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::servicedirectory_v1::
-    RegistrationServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// servicedirectory_v1::RegistrationServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::servicedirectory_v1::
-    RegistrationServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use servicedirectory_v1::RegistrationServiceRetryPolicy
-/// directly.
-using ::google::cloud::servicedirectory_v1::RegistrationServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_CONNECTION_H
diff --git a/google/cloud/servicedirectory/registration_connection_idempotency_policy.h b/google/cloud/servicedirectory/registration_connection_idempotency_policy.h
deleted file mode 100644
index 6039401743258..0000000000000
--- a/google/cloud/servicedirectory/registration_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/registration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/servicedirectory/v1/registration_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace servicedirectory {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// servicedirectory_v1::MakeDefaultRegistrationServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::servicedirectory_v1::
-    MakeDefaultRegistrationServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// servicedirectory_v1::RegistrationServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::servicedirectory_v1::
-    RegistrationServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/servicedirectory/registration_options.h b/google/cloud/servicedirectory/registration_options.h
deleted file mode 100644
index 0a878a55430fc..0000000000000
--- a/google/cloud/servicedirectory/registration_options.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/servicedirectory/v1/registration_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_OPTIONS_H
-
-#include "google/cloud/servicedirectory/registration_connection.h"
-#include "google/cloud/servicedirectory/registration_connection_idempotency_policy.h"
-#include "google/cloud/servicedirectory/v1/registration_options.h"
-
-namespace google {
-namespace cloud {
-namespace servicedirectory {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicedirectory_v1::RegistrationServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::servicedirectory_v1::
-    RegistrationServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// servicedirectory_v1::RegistrationServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::servicedirectory_v1::
-    RegistrationServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use servicedirectory_v1::RegistrationServicePolicyOptionList
-/// directly.
-using ::google::cloud::servicedirectory_v1::RegistrationServicePolicyOptionList;
-
-/// @deprecated Use servicedirectory_v1::RegistrationServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::servicedirectory_v1::
-    RegistrationServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicedirectory
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEDIRECTORY_REGISTRATION_OPTIONS_H
diff --git a/google/cloud/servicemanagement/BUILD.bazel b/google/cloud/servicemanagement/BUILD.bazel
index 13028d71bc546..1f8cdf50ec2d1 100644
--- a/google/cloud/servicemanagement/BUILD.bazel
+++ b/google/cloud/servicemanagement/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/servicemanagement/CMakeLists.txt b/google/cloud/servicemanagement/CMakeLists.txt
index b90d42b4779cd..a3eb69430c3dd 100644
--- a/google/cloud/servicemanagement/CMakeLists.txt
+++ b/google/cloud/servicemanagement/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(servicemanagement "Service Management API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(servicemanagement_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/servicemanagement/mocks/mock_service_manager_connection.h b/google/cloud/servicemanagement/mocks/mock_service_manager_connection.h
deleted file mode 100644
index c685f4018467c..0000000000000
--- a/google/cloud/servicemanagement/mocks/mock_service_manager_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicemanagement/v1/servicemanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_MOCKS_MOCK_SERVICE_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_MOCKS_MOCK_SERVICE_MANAGER_CONNECTION_H
-
-#include "google/cloud/servicemanagement/service_manager_connection.h"
-#include "google/cloud/servicemanagement/v1/mocks/mock_service_manager_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicemanagement_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace servicemanagement_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicemanagement_v1_mocks::MockServiceManagerConnection
-/// directly.
-using ::google::cloud::servicemanagement_v1_mocks::MockServiceManagerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicemanagement_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_MOCKS_MOCK_SERVICE_MANAGER_CONNECTION_H
diff --git a/google/cloud/servicemanagement/service_manager_client.h b/google/cloud/servicemanagement/service_manager_client.h
deleted file mode 100644
index 669f79069ff45..0000000000000
--- a/google/cloud/servicemanagement/service_manager_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicemanagement/v1/servicemanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_CLIENT_H
-
-#include "google/cloud/servicemanagement/service_manager_connection.h"
-#include "google/cloud/servicemanagement/v1/service_manager_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in servicemanagement_v1 instead of the aliases defined in
-///     this namespace.
-namespace servicemanagement {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicemanagement_v1::ServiceManagerClient directly.
-using ::google::cloud::servicemanagement_v1::ServiceManagerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicemanagement
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_CLIENT_H
diff --git a/google/cloud/servicemanagement/service_manager_connection.h b/google/cloud/servicemanagement/service_manager_connection.h
deleted file mode 100644
index 219dcead28ad6..0000000000000
--- a/google/cloud/servicemanagement/service_manager_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicemanagement/v1/servicemanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_CONNECTION_H
-
-#include "google/cloud/servicemanagement/service_manager_connection_idempotency_policy.h"
-#include "google/cloud/servicemanagement/v1/service_manager_connection.h"
-
-namespace google {
-namespace cloud {
-namespace servicemanagement {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicemanagement_v1::MakeServiceManagerConnection directly.
-using ::google::cloud::servicemanagement_v1::MakeServiceManagerConnection;
-
-/// @deprecated Use servicemanagement_v1::ServiceManagerConnection directly.
-using ::google::cloud::servicemanagement_v1::ServiceManagerConnection;
-
-/// @deprecated Use
-/// servicemanagement_v1::ServiceManagerLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::servicemanagement_v1::
-    ServiceManagerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use servicemanagement_v1::ServiceManagerLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::servicemanagement_v1::
-    ServiceManagerLimitedTimeRetryPolicy;
-
-/// @deprecated Use servicemanagement_v1::ServiceManagerRetryPolicy directly.
-using ::google::cloud::servicemanagement_v1::ServiceManagerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicemanagement
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_CONNECTION_H
diff --git a/google/cloud/servicemanagement/service_manager_connection_idempotency_policy.h b/google/cloud/servicemanagement/service_manager_connection_idempotency_policy.h
deleted file mode 100644
index 5c412b37ad4f2..0000000000000
--- a/google/cloud/servicemanagement/service_manager_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicemanagement/v1/servicemanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/servicemanagement/v1/service_manager_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace servicemanagement {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// servicemanagement_v1::MakeDefaultServiceManagerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::servicemanagement_v1::
-    MakeDefaultServiceManagerConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// servicemanagement_v1::ServiceManagerConnectionIdempotencyPolicy directly.
-using ::google::cloud::servicemanagement_v1::
-    ServiceManagerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicemanagement
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/servicemanagement/service_manager_options.h b/google/cloud/servicemanagement/service_manager_options.h
deleted file mode 100644
index 1e35150041d25..0000000000000
--- a/google/cloud/servicemanagement/service_manager_options.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/servicemanagement/v1/servicemanager.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_OPTIONS_H
-
-#include "google/cloud/servicemanagement/service_manager_connection.h"
-#include "google/cloud/servicemanagement/service_manager_connection_idempotency_policy.h"
-#include "google/cloud/servicemanagement/v1/service_manager_options.h"
-
-namespace google {
-namespace cloud {
-namespace servicemanagement {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use servicemanagement_v1::ServiceManagerPollingPolicyOption
-/// directly.
-using ::google::cloud::servicemanagement_v1::ServiceManagerPollingPolicyOption;
-
-/// @deprecated Use servicemanagement_v1::ServiceManagerBackoffPolicyOption
-/// directly.
-using ::google::cloud::servicemanagement_v1::ServiceManagerBackoffPolicyOption;
-
-/// @deprecated Use
-/// servicemanagement_v1::ServiceManagerConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::servicemanagement_v1::
-    ServiceManagerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use servicemanagement_v1::ServiceManagerPolicyOptionList
-/// directly.
-using ::google::cloud::servicemanagement_v1::ServiceManagerPolicyOptionList;
-
-/// @deprecated Use servicemanagement_v1::ServiceManagerRetryPolicyOption
-/// directly.
-using ::google::cloud::servicemanagement_v1::ServiceManagerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace servicemanagement
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEMANAGEMENT_SERVICE_MANAGER_OPTIONS_H
diff --git a/google/cloud/serviceusage/BUILD.bazel b/google/cloud/serviceusage/BUILD.bazel
index 5a2418c6b379d..2b6c4d93e0452 100644
--- a/google/cloud/serviceusage/BUILD.bazel
+++ b/google/cloud/serviceusage/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/serviceusage/CMakeLists.txt b/google/cloud/serviceusage/CMakeLists.txt
index 3a3279574c25f..61a5e8ff9f12f 100644
--- a/google/cloud/serviceusage/CMakeLists.txt
+++ b/google/cloud/serviceusage/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(serviceusage "Service Usage API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(serviceusage_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/serviceusage/mocks/mock_service_usage_connection.h b/google/cloud/serviceusage/mocks/mock_service_usage_connection.h
deleted file mode 100644
index 80c811733a678..0000000000000
--- a/google/cloud/serviceusage/mocks/mock_service_usage_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/serviceusage/v1/serviceusage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_MOCKS_MOCK_SERVICE_USAGE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_MOCKS_MOCK_SERVICE_USAGE_CONNECTION_H
-
-#include "google/cloud/serviceusage/service_usage_connection.h"
-#include "google/cloud/serviceusage/v1/mocks/mock_service_usage_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in serviceusage_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace serviceusage_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use serviceusage_v1_mocks::MockServiceUsageConnection directly.
-using ::google::cloud::serviceusage_v1_mocks::MockServiceUsageConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace serviceusage_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_MOCKS_MOCK_SERVICE_USAGE_CONNECTION_H
diff --git a/google/cloud/serviceusage/service_usage_client.h b/google/cloud/serviceusage/service_usage_client.h
deleted file mode 100644
index 906b150bef6d6..0000000000000
--- a/google/cloud/serviceusage/service_usage_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/serviceusage/v1/serviceusage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_CLIENT_H
-
-#include "google/cloud/serviceusage/service_usage_connection.h"
-#include "google/cloud/serviceusage/v1/service_usage_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in serviceusage_v1 instead of the aliases defined in
-///     this namespace.
-namespace serviceusage {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use serviceusage_v1::ServiceUsageClient directly.
-using ::google::cloud::serviceusage_v1::ServiceUsageClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace serviceusage
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_CLIENT_H
diff --git a/google/cloud/serviceusage/service_usage_connection.h b/google/cloud/serviceusage/service_usage_connection.h
deleted file mode 100644
index 77ad5fed3e003..0000000000000
--- a/google/cloud/serviceusage/service_usage_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/serviceusage/v1/serviceusage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_CONNECTION_H
-
-#include "google/cloud/serviceusage/service_usage_connection_idempotency_policy.h"
-#include "google/cloud/serviceusage/v1/service_usage_connection.h"
-
-namespace google {
-namespace cloud {
-namespace serviceusage {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use serviceusage_v1::MakeServiceUsageConnection directly.
-using ::google::cloud::serviceusage_v1::MakeServiceUsageConnection;
-
-/// @deprecated Use serviceusage_v1::ServiceUsageConnection directly.
-using ::google::cloud::serviceusage_v1::ServiceUsageConnection;
-
-/// @deprecated Use serviceusage_v1::ServiceUsageLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::serviceusage_v1::
-    ServiceUsageLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use serviceusage_v1::ServiceUsageLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::serviceusage_v1::ServiceUsageLimitedTimeRetryPolicy;
-
-/// @deprecated Use serviceusage_v1::ServiceUsageRetryPolicy directly.
-using ::google::cloud::serviceusage_v1::ServiceUsageRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace serviceusage
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_CONNECTION_H
diff --git a/google/cloud/serviceusage/service_usage_connection_idempotency_policy.h b/google/cloud/serviceusage/service_usage_connection_idempotency_policy.h
deleted file mode 100644
index fcd7db1f68abf..0000000000000
--- a/google/cloud/serviceusage/service_usage_connection_idempotency_policy.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/serviceusage/v1/serviceusage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/serviceusage/v1/service_usage_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace serviceusage {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// serviceusage_v1::MakeDefaultServiceUsageConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::serviceusage_v1::
-    MakeDefaultServiceUsageConnectionIdempotencyPolicy;
-
-/// @deprecated Use serviceusage_v1::ServiceUsageConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::serviceusage_v1::ServiceUsageConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace serviceusage
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/serviceusage/service_usage_options.h b/google/cloud/serviceusage/service_usage_options.h
deleted file mode 100644
index 4734efbfae2cf..0000000000000
--- a/google/cloud/serviceusage/service_usage_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/api/serviceusage/v1/serviceusage.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_OPTIONS_H
-
-#include "google/cloud/serviceusage/service_usage_connection.h"
-#include "google/cloud/serviceusage/service_usage_connection_idempotency_policy.h"
-#include "google/cloud/serviceusage/v1/service_usage_options.h"
-
-namespace google {
-namespace cloud {
-namespace serviceusage {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use serviceusage_v1::ServiceUsagePollingPolicyOption directly.
-using ::google::cloud::serviceusage_v1::ServiceUsagePollingPolicyOption;
-
-/// @deprecated Use serviceusage_v1::ServiceUsageBackoffPolicyOption directly.
-using ::google::cloud::serviceusage_v1::ServiceUsageBackoffPolicyOption;
-
-/// @deprecated Use
-/// serviceusage_v1::ServiceUsageConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::serviceusage_v1::
-    ServiceUsageConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use serviceusage_v1::ServiceUsagePolicyOptionList directly.
-using ::google::cloud::serviceusage_v1::ServiceUsagePolicyOptionList;
-
-/// @deprecated Use serviceusage_v1::ServiceUsageRetryPolicyOption directly.
-using ::google::cloud::serviceusage_v1::ServiceUsageRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace serviceusage
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SERVICEUSAGE_SERVICE_USAGE_OPTIONS_H
diff --git a/google/cloud/shell/BUILD.bazel b/google/cloud/shell/BUILD.bazel
index 0f780aa750d33..e6bbde2f1719f 100644
--- a/google/cloud/shell/BUILD.bazel
+++ b/google/cloud/shell/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/shell/CMakeLists.txt b/google/cloud/shell/CMakeLists.txt
index 12d1523ba9af6..72fd1622b3b4c 100644
--- a/google/cloud/shell/CMakeLists.txt
+++ b/google/cloud/shell/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(shell "Cloud Shell API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+google_cloud_cpp_add_gapic_library(shell "Cloud Shell API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(shell_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/shell/cloud_shell_client.h b/google/cloud/shell/cloud_shell_client.h
deleted file mode 100644
index 16192011c4790..0000000000000
--- a/google/cloud/shell/cloud_shell_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/shell/v1/cloudshell.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_CLIENT_H
-
-#include "google/cloud/shell/cloud_shell_connection.h"
-#include "google/cloud/shell/v1/cloud_shell_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in shell_v1 instead of the aliases defined in
-///     this namespace.
-namespace shell {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use shell_v1::CloudShellServiceClient directly.
-using ::google::cloud::shell_v1::CloudShellServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace shell
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_CLIENT_H
diff --git a/google/cloud/shell/cloud_shell_connection.h b/google/cloud/shell/cloud_shell_connection.h
deleted file mode 100644
index 26ce2041839ba..0000000000000
--- a/google/cloud/shell/cloud_shell_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/shell/v1/cloudshell.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_CONNECTION_H
-
-#include "google/cloud/shell/cloud_shell_connection_idempotency_policy.h"
-#include "google/cloud/shell/v1/cloud_shell_connection.h"
-
-namespace google {
-namespace cloud {
-namespace shell {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use shell_v1::MakeCloudShellServiceConnection directly.
-using ::google::cloud::shell_v1::MakeCloudShellServiceConnection;
-
-/// @deprecated Use shell_v1::CloudShellServiceConnection directly.
-using ::google::cloud::shell_v1::CloudShellServiceConnection;
-
-/// @deprecated Use shell_v1::CloudShellServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::shell_v1::CloudShellServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use shell_v1::CloudShellServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::shell_v1::CloudShellServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use shell_v1::CloudShellServiceRetryPolicy directly.
-using ::google::cloud::shell_v1::CloudShellServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace shell
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_CONNECTION_H
diff --git a/google/cloud/shell/cloud_shell_connection_idempotency_policy.h b/google/cloud/shell/cloud_shell_connection_idempotency_policy.h
deleted file mode 100644
index 4393ca675c9d3..0000000000000
--- a/google/cloud/shell/cloud_shell_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/shell/v1/cloudshell.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/shell/v1/cloud_shell_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace shell {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// shell_v1::MakeDefaultCloudShellServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::shell_v1::
-    MakeDefaultCloudShellServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use shell_v1::CloudShellServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::shell_v1::CloudShellServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace shell
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/shell/cloud_shell_options.h b/google/cloud/shell/cloud_shell_options.h
deleted file mode 100644
index 17a96dad8c54f..0000000000000
--- a/google/cloud/shell/cloud_shell_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/shell/v1/cloudshell.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_OPTIONS_H
-
-#include "google/cloud/shell/cloud_shell_connection.h"
-#include "google/cloud/shell/cloud_shell_connection_idempotency_policy.h"
-#include "google/cloud/shell/v1/cloud_shell_options.h"
-
-namespace google {
-namespace cloud {
-namespace shell {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use shell_v1::CloudShellServicePollingPolicyOption directly.
-using ::google::cloud::shell_v1::CloudShellServicePollingPolicyOption;
-
-/// @deprecated Use shell_v1::CloudShellServiceBackoffPolicyOption directly.
-using ::google::cloud::shell_v1::CloudShellServiceBackoffPolicyOption;
-
-/// @deprecated Use shell_v1::CloudShellServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::shell_v1::
-    CloudShellServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use shell_v1::CloudShellServicePolicyOptionList directly.
-using ::google::cloud::shell_v1::CloudShellServicePolicyOptionList;
-
-/// @deprecated Use shell_v1::CloudShellServiceRetryPolicyOption directly.
-using ::google::cloud::shell_v1::CloudShellServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace shell
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_CLOUD_SHELL_OPTIONS_H
diff --git a/google/cloud/shell/mocks/mock_cloud_shell_connection.h b/google/cloud/shell/mocks/mock_cloud_shell_connection.h
deleted file mode 100644
index 7fe8f7e8d5135..0000000000000
--- a/google/cloud/shell/mocks/mock_cloud_shell_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/shell/v1/cloudshell.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_MOCKS_MOCK_CLOUD_SHELL_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_MOCKS_MOCK_CLOUD_SHELL_CONNECTION_H
-
-#include "google/cloud/shell/cloud_shell_connection.h"
-#include "google/cloud/shell/v1/mocks/mock_cloud_shell_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in shell_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace shell_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use shell_v1_mocks::MockCloudShellServiceConnection directly.
-using ::google::cloud::shell_v1_mocks::MockCloudShellServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace shell_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SHELL_MOCKS_MOCK_CLOUD_SHELL_CONNECTION_H
diff --git a/google/cloud/speech/BUILD.bazel b/google/cloud/speech/BUILD.bazel
index 8bc4806da5b4c..5b1fc246d16d4 100644
--- a/google/cloud/speech/BUILD.bazel
+++ b/google/cloud/speech/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "v2/",
 ]
diff --git a/google/cloud/speech/CMakeLists.txt b/google/cloud/speech/CMakeLists.txt
index 91b886f41f8ad..65a95f2c110e0 100644
--- a/google/cloud/speech/CMakeLists.txt
+++ b/google/cloud/speech/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     speech "Cloud Speech-to-Text API"
-    SERVICE_DIRS "__EMPTY__" "v1/" "v2/"
+    SERVICE_DIRS "v1/" "v2/"
     BACKWARDS_COMPAT_PROTO_TARGETS "cloud_speech_protos")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
diff --git a/google/cloud/speech/mocks/mock_speech_connection.h b/google/cloud/speech/mocks/mock_speech_connection.h
deleted file mode 100644
index 1b150b6eca38c..0000000000000
--- a/google/cloud/speech/mocks/mock_speech_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/speech/v1/cloud_speech.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_MOCKS_MOCK_SPEECH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_MOCKS_MOCK_SPEECH_CONNECTION_H
-
-#include "google/cloud/speech/speech_connection.h"
-#include "google/cloud/speech/v1/mocks/mock_speech_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in speech_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace speech_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use speech_v1_mocks::MockSpeechConnection directly.
-using ::google::cloud::speech_v1_mocks::MockSpeechConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace speech_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_MOCKS_MOCK_SPEECH_CONNECTION_H
diff --git a/google/cloud/speech/speech_client.h b/google/cloud/speech/speech_client.h
deleted file mode 100644
index dfa416c22b2cd..0000000000000
--- a/google/cloud/speech/speech_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/speech/v1/cloud_speech.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_CLIENT_H
-
-#include "google/cloud/speech/speech_connection.h"
-#include "google/cloud/speech/v1/speech_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in speech_v1 instead of the aliases defined in
-///     this namespace.
-namespace speech {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use speech_v1::SpeechClient directly.
-using ::google::cloud::speech_v1::SpeechClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace speech
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_CLIENT_H
diff --git a/google/cloud/speech/speech_connection.h b/google/cloud/speech/speech_connection.h
deleted file mode 100644
index 31f37b4489bc3..0000000000000
--- a/google/cloud/speech/speech_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/speech/v1/cloud_speech.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_CONNECTION_H
-
-#include "google/cloud/speech/speech_connection_idempotency_policy.h"
-#include "google/cloud/speech/v1/speech_connection.h"
-
-namespace google {
-namespace cloud {
-namespace speech {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use speech_v1::MakeSpeechConnection directly.
-using ::google::cloud::speech_v1::MakeSpeechConnection;
-
-/// @deprecated Use speech_v1::SpeechConnection directly.
-using ::google::cloud::speech_v1::SpeechConnection;
-
-/// @deprecated Use speech_v1::SpeechLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::speech_v1::SpeechLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use speech_v1::SpeechLimitedTimeRetryPolicy directly.
-using ::google::cloud::speech_v1::SpeechLimitedTimeRetryPolicy;
-
-/// @deprecated Use speech_v1::SpeechRetryPolicy directly.
-using ::google::cloud::speech_v1::SpeechRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace speech
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_CONNECTION_H
diff --git a/google/cloud/speech/speech_connection_idempotency_policy.h b/google/cloud/speech/speech_connection_idempotency_policy.h
deleted file mode 100644
index eebf1175cd0af..0000000000000
--- a/google/cloud/speech/speech_connection_idempotency_policy.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/speech/v1/cloud_speech.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/speech/v1/speech_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace speech {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use speech_v1::MakeDefaultSpeechConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::speech_v1::MakeDefaultSpeechConnectionIdempotencyPolicy;
-
-/// @deprecated Use speech_v1::SpeechConnectionIdempotencyPolicy directly.
-using ::google::cloud::speech_v1::SpeechConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace speech
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/speech/speech_options.h b/google/cloud/speech/speech_options.h
deleted file mode 100644
index 4e7ac87acf863..0000000000000
--- a/google/cloud/speech/speech_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/speech/v1/cloud_speech.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_OPTIONS_H
-
-#include "google/cloud/speech/speech_connection.h"
-#include "google/cloud/speech/speech_connection_idempotency_policy.h"
-#include "google/cloud/speech/v1/speech_options.h"
-
-namespace google {
-namespace cloud {
-namespace speech {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use speech_v1::SpeechPollingPolicyOption directly.
-using ::google::cloud::speech_v1::SpeechPollingPolicyOption;
-
-/// @deprecated Use speech_v1::SpeechBackoffPolicyOption directly.
-using ::google::cloud::speech_v1::SpeechBackoffPolicyOption;
-
-/// @deprecated Use speech_v1::SpeechConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::speech_v1::SpeechConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use speech_v1::SpeechPolicyOptionList directly.
-using ::google::cloud::speech_v1::SpeechPolicyOptionList;
-
-/// @deprecated Use speech_v1::SpeechRetryPolicyOption directly.
-using ::google::cloud::speech_v1::SpeechRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace speech
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPEECH_SPEECH_OPTIONS_H
diff --git a/google/cloud/storagetransfer/BUILD.bazel b/google/cloud/storagetransfer/BUILD.bazel
index ae94c5bb0841c..1dfe331c452b2 100644
--- a/google/cloud/storagetransfer/BUILD.bazel
+++ b/google/cloud/storagetransfer/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/storagetransfer/CMakeLists.txt b/google/cloud/storagetransfer/CMakeLists.txt
index 79b1ad38d6038..713edb09a209c 100644
--- a/google/cloud/storagetransfer/CMakeLists.txt
+++ b/google/cloud/storagetransfer/CMakeLists.txt
@@ -27,7 +27,7 @@ endif ()
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(storagetransfer "Storage Transfer API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(storagetransfer_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/storagetransfer/mocks/mock_storage_transfer_connection.h b/google/cloud/storagetransfer/mocks/mock_storage_transfer_connection.h
deleted file mode 100644
index c66f70ecca6f8..0000000000000
--- a/google/cloud/storagetransfer/mocks/mock_storage_transfer_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/storagetransfer/v1/transfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_MOCKS_MOCK_STORAGE_TRANSFER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_MOCKS_MOCK_STORAGE_TRANSFER_CONNECTION_H
-
-#include "google/cloud/storagetransfer/storage_transfer_connection.h"
-#include "google/cloud/storagetransfer/v1/mocks/mock_storage_transfer_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in storagetransfer_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace storagetransfer_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// storagetransfer_v1_mocks::MockStorageTransferServiceConnection directly.
-using ::google::cloud::storagetransfer_v1_mocks::
-    MockStorageTransferServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace storagetransfer_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_MOCKS_MOCK_STORAGE_TRANSFER_CONNECTION_H
diff --git a/google/cloud/storagetransfer/storage_transfer_client.h b/google/cloud/storagetransfer/storage_transfer_client.h
deleted file mode 100644
index 5c18782710b6c..0000000000000
--- a/google/cloud/storagetransfer/storage_transfer_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/storagetransfer/v1/transfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_CLIENT_H
-
-#include "google/cloud/storagetransfer/storage_transfer_connection.h"
-#include "google/cloud/storagetransfer/v1/storage_transfer_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in storagetransfer_v1 instead of the aliases defined in
-///     this namespace.
-namespace storagetransfer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use storagetransfer_v1::StorageTransferServiceClient directly.
-using ::google::cloud::storagetransfer_v1::StorageTransferServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace storagetransfer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_CLIENT_H
diff --git a/google/cloud/storagetransfer/storage_transfer_connection.h b/google/cloud/storagetransfer/storage_transfer_connection.h
deleted file mode 100644
index 689c7b2d3a887..0000000000000
--- a/google/cloud/storagetransfer/storage_transfer_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/storagetransfer/v1/transfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_CONNECTION_H
-
-#include "google/cloud/storagetransfer/storage_transfer_connection_idempotency_policy.h"
-#include "google/cloud/storagetransfer/v1/storage_transfer_connection.h"
-
-namespace google {
-namespace cloud {
-namespace storagetransfer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use storagetransfer_v1::MakeStorageTransferServiceConnection
-/// directly.
-using ::google::cloud::storagetransfer_v1::MakeStorageTransferServiceConnection;
-
-/// @deprecated Use storagetransfer_v1::StorageTransferServiceConnection
-/// directly.
-using ::google::cloud::storagetransfer_v1::StorageTransferServiceConnection;
-
-/// @deprecated Use
-/// storagetransfer_v1::StorageTransferServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::storagetransfer_v1::
-    StorageTransferServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// storagetransfer_v1::StorageTransferServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::storagetransfer_v1::
-    StorageTransferServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use storagetransfer_v1::StorageTransferServiceRetryPolicy
-/// directly.
-using ::google::cloud::storagetransfer_v1::StorageTransferServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace storagetransfer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_CONNECTION_H
diff --git a/google/cloud/storagetransfer/storage_transfer_connection_idempotency_policy.h b/google/cloud/storagetransfer/storage_transfer_connection_idempotency_policy.h
deleted file mode 100644
index 1186f9731902c..0000000000000
--- a/google/cloud/storagetransfer/storage_transfer_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/storagetransfer/v1/transfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/storagetransfer/v1/storage_transfer_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace storagetransfer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// storagetransfer_v1::MakeDefaultStorageTransferServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::storagetransfer_v1::
-    MakeDefaultStorageTransferServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// storagetransfer_v1::StorageTransferServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::storagetransfer_v1::
-    StorageTransferServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace storagetransfer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/storagetransfer/storage_transfer_options.h b/google/cloud/storagetransfer/storage_transfer_options.h
deleted file mode 100644
index d2f51361bbf9c..0000000000000
--- a/google/cloud/storagetransfer/storage_transfer_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/storagetransfer/v1/transfer.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_OPTIONS_H
-
-#include "google/cloud/storagetransfer/storage_transfer_connection.h"
-#include "google/cloud/storagetransfer/storage_transfer_connection_idempotency_policy.h"
-#include "google/cloud/storagetransfer/v1/storage_transfer_options.h"
-
-namespace google {
-namespace cloud {
-namespace storagetransfer {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// storagetransfer_v1::StorageTransferServicePollingPolicyOption directly.
-using ::google::cloud::storagetransfer_v1::
-    StorageTransferServicePollingPolicyOption;
-
-/// @deprecated Use
-/// storagetransfer_v1::StorageTransferServiceBackoffPolicyOption directly.
-using ::google::cloud::storagetransfer_v1::
-    StorageTransferServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// storagetransfer_v1::StorageTransferServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::storagetransfer_v1::
-    StorageTransferServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use storagetransfer_v1::StorageTransferServicePolicyOptionList
-/// directly.
-using ::google::cloud::storagetransfer_v1::
-    StorageTransferServicePolicyOptionList;
-
-/// @deprecated Use storagetransfer_v1::StorageTransferServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::storagetransfer_v1::
-    StorageTransferServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace storagetransfer
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGETRANSFER_STORAGE_TRANSFER_OPTIONS_H
diff --git a/google/cloud/talent/BUILD.bazel b/google/cloud/talent/BUILD.bazel
index 77b2f6a35f81f..a0db9a6177e7f 100644
--- a/google/cloud/talent/BUILD.bazel
+++ b/google/cloud/talent/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v4/",
 ]
 
diff --git a/google/cloud/talent/CMakeLists.txt b/google/cloud/talent/CMakeLists.txt
index 5fb5275296a46..a00059d0de5d7 100644
--- a/google/cloud/talent/CMakeLists.txt
+++ b/google/cloud/talent/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(talent "Cloud Talent Solution API"
-                                   SERVICE_DIRS "__EMPTY__" "v4/")
+                                   SERVICE_DIRS "v4/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(talent_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/talent/company_client.h b/google/cloud/talent/company_client.h
deleted file mode 100644
index 47e6193bb2bcd..0000000000000
--- a/google/cloud/talent/company_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/company_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_CLIENT_H
-
-#include "google/cloud/talent/company_connection.h"
-#include "google/cloud/talent/v4/company_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4 instead of the aliases defined in
-///     this namespace.
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::CompanyServiceClient directly.
-using ::google::cloud::talent_v4::CompanyServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_CLIENT_H
diff --git a/google/cloud/talent/company_connection.h b/google/cloud/talent/company_connection.h
deleted file mode 100644
index 016f566677330..0000000000000
--- a/google/cloud/talent/company_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/company_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_CONNECTION_H
-
-#include "google/cloud/talent/company_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/company_connection.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::MakeCompanyServiceConnection directly.
-using ::google::cloud::talent_v4::MakeCompanyServiceConnection;
-
-/// @deprecated Use talent_v4::CompanyServiceConnection directly.
-using ::google::cloud::talent_v4::CompanyServiceConnection;
-
-/// @deprecated Use talent_v4::CompanyServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::talent_v4::CompanyServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use talent_v4::CompanyServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::talent_v4::CompanyServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use talent_v4::CompanyServiceRetryPolicy directly.
-using ::google::cloud::talent_v4::CompanyServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_CONNECTION_H
diff --git a/google/cloud/talent/company_connection_idempotency_policy.h b/google/cloud/talent/company_connection_idempotency_policy.h
deleted file mode 100644
index 25daf925d6465..0000000000000
--- a/google/cloud/talent/company_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/company_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/talent/v4/company_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// talent_v4::MakeDefaultCompanyServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::talent_v4::
-    MakeDefaultCompanyServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use talent_v4::CompanyServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::talent_v4::CompanyServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/talent/company_options.h b/google/cloud/talent/company_options.h
deleted file mode 100644
index a815083579757..0000000000000
--- a/google/cloud/talent/company_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/company_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_OPTIONS_H
-
-#include "google/cloud/talent/company_connection.h"
-#include "google/cloud/talent/company_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/company_options.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::CompanyServiceBackoffPolicyOption directly.
-using ::google::cloud::talent_v4::CompanyServiceBackoffPolicyOption;
-
-/// @deprecated Use talent_v4::CompanyServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::talent_v4::
-    CompanyServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use talent_v4::CompanyServicePolicyOptionList directly.
-using ::google::cloud::talent_v4::CompanyServicePolicyOptionList;
-
-/// @deprecated Use talent_v4::CompanyServiceRetryPolicyOption directly.
-using ::google::cloud::talent_v4::CompanyServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPANY_OPTIONS_H
diff --git a/google/cloud/talent/completion_client.h b/google/cloud/talent/completion_client.h
deleted file mode 100644
index 1b26ca817af09..0000000000000
--- a/google/cloud/talent/completion_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_CLIENT_H
-
-#include "google/cloud/talent/completion_connection.h"
-#include "google/cloud/talent/v4/completion_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4 instead of the aliases defined in
-///     this namespace.
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::CompletionClient directly.
-using ::google::cloud::talent_v4::CompletionClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_CLIENT_H
diff --git a/google/cloud/talent/completion_connection.h b/google/cloud/talent/completion_connection.h
deleted file mode 100644
index 4dc55c0501ab8..0000000000000
--- a/google/cloud/talent/completion_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_CONNECTION_H
-
-#include "google/cloud/talent/completion_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/completion_connection.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::MakeCompletionConnection directly.
-using ::google::cloud::talent_v4::MakeCompletionConnection;
-
-/// @deprecated Use talent_v4::CompletionConnection directly.
-using ::google::cloud::talent_v4::CompletionConnection;
-
-/// @deprecated Use talent_v4::CompletionLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::talent_v4::CompletionLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use talent_v4::CompletionLimitedTimeRetryPolicy directly.
-using ::google::cloud::talent_v4::CompletionLimitedTimeRetryPolicy;
-
-/// @deprecated Use talent_v4::CompletionRetryPolicy directly.
-using ::google::cloud::talent_v4::CompletionRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_CONNECTION_H
diff --git a/google/cloud/talent/completion_connection_idempotency_policy.h b/google/cloud/talent/completion_connection_idempotency_policy.h
deleted file mode 100644
index 1a0957cbdb53c..0000000000000
--- a/google/cloud/talent/completion_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/talent/v4/completion_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::MakeDefaultCompletionConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::talent_v4::
-    MakeDefaultCompletionConnectionIdempotencyPolicy;
-
-/// @deprecated Use talent_v4::CompletionConnectionIdempotencyPolicy directly.
-using ::google::cloud::talent_v4::CompletionConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/talent/completion_options.h b/google/cloud/talent/completion_options.h
deleted file mode 100644
index c2f54162cc38b..0000000000000
--- a/google/cloud/talent/completion_options.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_OPTIONS_H
-
-#include "google/cloud/talent/completion_connection.h"
-#include "google/cloud/talent/completion_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/completion_options.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::CompletionBackoffPolicyOption directly.
-using ::google::cloud::talent_v4::CompletionBackoffPolicyOption;
-
-/// @deprecated Use talent_v4::CompletionConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::talent_v4::CompletionConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use talent_v4::CompletionPolicyOptionList directly.
-using ::google::cloud::talent_v4::CompletionPolicyOptionList;
-
-/// @deprecated Use talent_v4::CompletionRetryPolicyOption directly.
-using ::google::cloud::talent_v4::CompletionRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_COMPLETION_OPTIONS_H
diff --git a/google/cloud/talent/event_client.h b/google/cloud/talent/event_client.h
deleted file mode 100644
index 5967011f513bf..0000000000000
--- a/google/cloud/talent/event_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_CLIENT_H
-
-#include "google/cloud/talent/event_connection.h"
-#include "google/cloud/talent/v4/event_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4 instead of the aliases defined in
-///     this namespace.
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::EventServiceClient directly.
-using ::google::cloud::talent_v4::EventServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_CLIENT_H
diff --git a/google/cloud/talent/event_connection.h b/google/cloud/talent/event_connection.h
deleted file mode 100644
index 0d9b8958276b8..0000000000000
--- a/google/cloud/talent/event_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_CONNECTION_H
-
-#include "google/cloud/talent/event_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/event_connection.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::MakeEventServiceConnection directly.
-using ::google::cloud::talent_v4::MakeEventServiceConnection;
-
-/// @deprecated Use talent_v4::EventServiceConnection directly.
-using ::google::cloud::talent_v4::EventServiceConnection;
-
-/// @deprecated Use talent_v4::EventServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::talent_v4::EventServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use talent_v4::EventServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::talent_v4::EventServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use talent_v4::EventServiceRetryPolicy directly.
-using ::google::cloud::talent_v4::EventServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_CONNECTION_H
diff --git a/google/cloud/talent/event_connection_idempotency_policy.h b/google/cloud/talent/event_connection_idempotency_policy.h
deleted file mode 100644
index f7cd0030453a3..0000000000000
--- a/google/cloud/talent/event_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/talent/v4/event_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// talent_v4::MakeDefaultEventServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::talent_v4::
-    MakeDefaultEventServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use talent_v4::EventServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::talent_v4::EventServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/talent/event_options.h b/google/cloud/talent/event_options.h
deleted file mode 100644
index 59c465f6e5e1f..0000000000000
--- a/google/cloud/talent/event_options.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_OPTIONS_H
-
-#include "google/cloud/talent/event_connection.h"
-#include "google/cloud/talent/event_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/event_options.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::EventServiceBackoffPolicyOption directly.
-using ::google::cloud::talent_v4::EventServiceBackoffPolicyOption;
-
-/// @deprecated Use talent_v4::EventServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::talent_v4::EventServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use talent_v4::EventServicePolicyOptionList directly.
-using ::google::cloud::talent_v4::EventServicePolicyOptionList;
-
-/// @deprecated Use talent_v4::EventServiceRetryPolicyOption directly.
-using ::google::cloud::talent_v4::EventServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_EVENT_OPTIONS_H
diff --git a/google/cloud/talent/job_client.h b/google/cloud/talent/job_client.h
deleted file mode 100644
index 5fe7e3bcb3b4b..0000000000000
--- a/google/cloud/talent/job_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/job_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_CLIENT_H
-
-#include "google/cloud/talent/job_connection.h"
-#include "google/cloud/talent/v4/job_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4 instead of the aliases defined in
-///     this namespace.
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::JobServiceClient directly.
-using ::google::cloud::talent_v4::JobServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_CLIENT_H
diff --git a/google/cloud/talent/job_connection.h b/google/cloud/talent/job_connection.h
deleted file mode 100644
index 2adf8e45b8346..0000000000000
--- a/google/cloud/talent/job_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/job_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_CONNECTION_H
-
-#include "google/cloud/talent/job_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/job_connection.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::MakeJobServiceConnection directly.
-using ::google::cloud::talent_v4::MakeJobServiceConnection;
-
-/// @deprecated Use talent_v4::JobServiceConnection directly.
-using ::google::cloud::talent_v4::JobServiceConnection;
-
-/// @deprecated Use talent_v4::JobServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::talent_v4::JobServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use talent_v4::JobServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::talent_v4::JobServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use talent_v4::JobServiceRetryPolicy directly.
-using ::google::cloud::talent_v4::JobServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_CONNECTION_H
diff --git a/google/cloud/talent/job_connection_idempotency_policy.h b/google/cloud/talent/job_connection_idempotency_policy.h
deleted file mode 100644
index a25f4138df361..0000000000000
--- a/google/cloud/talent/job_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/job_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/talent/v4/job_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::MakeDefaultJobServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::talent_v4::
-    MakeDefaultJobServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use talent_v4::JobServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::talent_v4::JobServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/talent/job_options.h b/google/cloud/talent/job_options.h
deleted file mode 100644
index 1dcd0b3f4c381..0000000000000
--- a/google/cloud/talent/job_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/job_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_OPTIONS_H
-
-#include "google/cloud/talent/job_connection.h"
-#include "google/cloud/talent/job_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/job_options.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::JobServicePollingPolicyOption directly.
-using ::google::cloud::talent_v4::JobServicePollingPolicyOption;
-
-/// @deprecated Use talent_v4::JobServiceBackoffPolicyOption directly.
-using ::google::cloud::talent_v4::JobServiceBackoffPolicyOption;
-
-/// @deprecated Use talent_v4::JobServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::talent_v4::JobServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use talent_v4::JobServicePolicyOptionList directly.
-using ::google::cloud::talent_v4::JobServicePolicyOptionList;
-
-/// @deprecated Use talent_v4::JobServiceRetryPolicyOption directly.
-using ::google::cloud::talent_v4::JobServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_JOB_OPTIONS_H
diff --git a/google/cloud/talent/mocks/mock_company_connection.h b/google/cloud/talent/mocks/mock_company_connection.h
deleted file mode 100644
index e7e9c4f31f442..0000000000000
--- a/google/cloud/talent/mocks/mock_company_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/company_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_COMPANY_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_COMPANY_CONNECTION_H
-
-#include "google/cloud/talent/company_connection.h"
-#include "google/cloud/talent/v4/mocks/mock_company_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4_mocks instead of the aliases
-///     defined in this namespace.
-namespace talent_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4_mocks::MockCompanyServiceConnection directly.
-using ::google::cloud::talent_v4_mocks::MockCompanyServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_COMPANY_CONNECTION_H
diff --git a/google/cloud/talent/mocks/mock_completion_connection.h b/google/cloud/talent/mocks/mock_completion_connection.h
deleted file mode 100644
index c59f8b782cf54..0000000000000
--- a/google/cloud/talent/mocks/mock_completion_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/completion_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_COMPLETION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_COMPLETION_CONNECTION_H
-
-#include "google/cloud/talent/completion_connection.h"
-#include "google/cloud/talent/v4/mocks/mock_completion_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4_mocks instead of the aliases
-///     defined in this namespace.
-namespace talent_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4_mocks::MockCompletionConnection directly.
-using ::google::cloud::talent_v4_mocks::MockCompletionConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_COMPLETION_CONNECTION_H
diff --git a/google/cloud/talent/mocks/mock_event_connection.h b/google/cloud/talent/mocks/mock_event_connection.h
deleted file mode 100644
index f0a8402145936..0000000000000
--- a/google/cloud/talent/mocks/mock_event_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/event_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_EVENT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_EVENT_CONNECTION_H
-
-#include "google/cloud/talent/event_connection.h"
-#include "google/cloud/talent/v4/mocks/mock_event_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4_mocks instead of the aliases
-///     defined in this namespace.
-namespace talent_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4_mocks::MockEventServiceConnection directly.
-using ::google::cloud::talent_v4_mocks::MockEventServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_EVENT_CONNECTION_H
diff --git a/google/cloud/talent/mocks/mock_job_connection.h b/google/cloud/talent/mocks/mock_job_connection.h
deleted file mode 100644
index 59d973836ab17..0000000000000
--- a/google/cloud/talent/mocks/mock_job_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/job_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_JOB_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_JOB_CONNECTION_H
-
-#include "google/cloud/talent/job_connection.h"
-#include "google/cloud/talent/v4/mocks/mock_job_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4_mocks instead of the aliases
-///     defined in this namespace.
-namespace talent_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4_mocks::MockJobServiceConnection directly.
-using ::google::cloud::talent_v4_mocks::MockJobServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_JOB_CONNECTION_H
diff --git a/google/cloud/talent/mocks/mock_tenant_connection.h b/google/cloud/talent/mocks/mock_tenant_connection.h
deleted file mode 100644
index 494bbaa99174d..0000000000000
--- a/google/cloud/talent/mocks/mock_tenant_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/tenant_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_TENANT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_TENANT_CONNECTION_H
-
-#include "google/cloud/talent/tenant_connection.h"
-#include "google/cloud/talent/v4/mocks/mock_tenant_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4_mocks instead of the aliases
-///     defined in this namespace.
-namespace talent_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4_mocks::MockTenantServiceConnection directly.
-using ::google::cloud::talent_v4_mocks::MockTenantServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_MOCKS_MOCK_TENANT_CONNECTION_H
diff --git a/google/cloud/talent/tenant_client.h b/google/cloud/talent/tenant_client.h
deleted file mode 100644
index 45855c5033fb4..0000000000000
--- a/google/cloud/talent/tenant_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/tenant_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_CLIENT_H
-
-#include "google/cloud/talent/tenant_connection.h"
-#include "google/cloud/talent/v4/tenant_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in talent_v4 instead of the aliases defined in
-///     this namespace.
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::TenantServiceClient directly.
-using ::google::cloud::talent_v4::TenantServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_CLIENT_H
diff --git a/google/cloud/talent/tenant_connection.h b/google/cloud/talent/tenant_connection.h
deleted file mode 100644
index 0b4114a588f58..0000000000000
--- a/google/cloud/talent/tenant_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/tenant_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_CONNECTION_H
-
-#include "google/cloud/talent/tenant_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/tenant_connection.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::MakeTenantServiceConnection directly.
-using ::google::cloud::talent_v4::MakeTenantServiceConnection;
-
-/// @deprecated Use talent_v4::TenantServiceConnection directly.
-using ::google::cloud::talent_v4::TenantServiceConnection;
-
-/// @deprecated Use talent_v4::TenantServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::talent_v4::TenantServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use talent_v4::TenantServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::talent_v4::TenantServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use talent_v4::TenantServiceRetryPolicy directly.
-using ::google::cloud::talent_v4::TenantServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_CONNECTION_H
diff --git a/google/cloud/talent/tenant_connection_idempotency_policy.h b/google/cloud/talent/tenant_connection_idempotency_policy.h
deleted file mode 100644
index aa756c1177aa0..0000000000000
--- a/google/cloud/talent/tenant_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/tenant_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/talent/v4/tenant_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// talent_v4::MakeDefaultTenantServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::talent_v4::
-    MakeDefaultTenantServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use talent_v4::TenantServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::talent_v4::TenantServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/talent/tenant_options.h b/google/cloud/talent/tenant_options.h
deleted file mode 100644
index 1bc3638f25cff..0000000000000
--- a/google/cloud/talent/tenant_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/talent/v4/tenant_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_OPTIONS_H
-
-#include "google/cloud/talent/tenant_connection.h"
-#include "google/cloud/talent/tenant_connection_idempotency_policy.h"
-#include "google/cloud/talent/v4/tenant_options.h"
-
-namespace google {
-namespace cloud {
-namespace talent {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use talent_v4::TenantServiceBackoffPolicyOption directly.
-using ::google::cloud::talent_v4::TenantServiceBackoffPolicyOption;
-
-/// @deprecated Use talent_v4::TenantServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::talent_v4::
-    TenantServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use talent_v4::TenantServicePolicyOptionList directly.
-using ::google::cloud::talent_v4::TenantServicePolicyOptionList;
-
-/// @deprecated Use talent_v4::TenantServiceRetryPolicyOption directly.
-using ::google::cloud::talent_v4::TenantServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace talent
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TALENT_TENANT_OPTIONS_H
diff --git a/google/cloud/tasks/BUILD.bazel b/google/cloud/tasks/BUILD.bazel
index 592637c931833..8b524d5564914 100644
--- a/google/cloud/tasks/BUILD.bazel
+++ b/google/cloud/tasks/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v2/",
 ]
 
diff --git a/google/cloud/tasks/CMakeLists.txt b/google/cloud/tasks/CMakeLists.txt
index 7e49f40b647ea..9f98e60accea6 100644
--- a/google/cloud/tasks/CMakeLists.txt
+++ b/google/cloud/tasks/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(tasks "Cloud Tasks API"
-                                   SERVICE_DIRS "__EMPTY__" "v2/")
+google_cloud_cpp_add_gapic_library(tasks "Cloud Tasks API" SERVICE_DIRS "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(tasks_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/tasks/cloud_tasks_client.h b/google/cloud/tasks/cloud_tasks_client.h
deleted file mode 100644
index 5b310a62fb0da..0000000000000
--- a/google/cloud/tasks/cloud_tasks_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tasks/v2/cloudtasks.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_CLIENT_H
-
-#include "google/cloud/tasks/cloud_tasks_connection.h"
-#include "google/cloud/tasks/v2/cloud_tasks_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in tasks_v2 instead of the aliases defined in
-///     this namespace.
-namespace tasks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tasks_v2::CloudTasksClient directly.
-using ::google::cloud::tasks_v2::CloudTasksClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tasks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_CLIENT_H
diff --git a/google/cloud/tasks/cloud_tasks_connection.h b/google/cloud/tasks/cloud_tasks_connection.h
deleted file mode 100644
index 90e05ec75e158..0000000000000
--- a/google/cloud/tasks/cloud_tasks_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tasks/v2/cloudtasks.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_CONNECTION_H
-
-#include "google/cloud/tasks/cloud_tasks_connection_idempotency_policy.h"
-#include "google/cloud/tasks/v2/cloud_tasks_connection.h"
-
-namespace google {
-namespace cloud {
-namespace tasks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tasks_v2::MakeCloudTasksConnection directly.
-using ::google::cloud::tasks_v2::MakeCloudTasksConnection;
-
-/// @deprecated Use tasks_v2::CloudTasksConnection directly.
-using ::google::cloud::tasks_v2::CloudTasksConnection;
-
-/// @deprecated Use tasks_v2::CloudTasksLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::tasks_v2::CloudTasksLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use tasks_v2::CloudTasksLimitedTimeRetryPolicy directly.
-using ::google::cloud::tasks_v2::CloudTasksLimitedTimeRetryPolicy;
-
-/// @deprecated Use tasks_v2::CloudTasksRetryPolicy directly.
-using ::google::cloud::tasks_v2::CloudTasksRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tasks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_CONNECTION_H
diff --git a/google/cloud/tasks/cloud_tasks_connection_idempotency_policy.h b/google/cloud/tasks/cloud_tasks_connection_idempotency_policy.h
deleted file mode 100644
index 87799940d1c42..0000000000000
--- a/google/cloud/tasks/cloud_tasks_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tasks/v2/cloudtasks.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/tasks/v2/cloud_tasks_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace tasks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tasks_v2::MakeDefaultCloudTasksConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::tasks_v2::
-    MakeDefaultCloudTasksConnectionIdempotencyPolicy;
-
-/// @deprecated Use tasks_v2::CloudTasksConnectionIdempotencyPolicy directly.
-using ::google::cloud::tasks_v2::CloudTasksConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tasks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/tasks/cloud_tasks_options.h b/google/cloud/tasks/cloud_tasks_options.h
deleted file mode 100644
index 6632e2d6b3ecf..0000000000000
--- a/google/cloud/tasks/cloud_tasks_options.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tasks/v2/cloudtasks.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_OPTIONS_H
-
-#include "google/cloud/tasks/cloud_tasks_connection.h"
-#include "google/cloud/tasks/cloud_tasks_connection_idempotency_policy.h"
-#include "google/cloud/tasks/v2/cloud_tasks_options.h"
-
-namespace google {
-namespace cloud {
-namespace tasks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tasks_v2::CloudTasksBackoffPolicyOption directly.
-using ::google::cloud::tasks_v2::CloudTasksBackoffPolicyOption;
-
-/// @deprecated Use tasks_v2::CloudTasksConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::tasks_v2::CloudTasksConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use tasks_v2::CloudTasksPolicyOptionList directly.
-using ::google::cloud::tasks_v2::CloudTasksPolicyOptionList;
-
-/// @deprecated Use tasks_v2::CloudTasksRetryPolicyOption directly.
-using ::google::cloud::tasks_v2::CloudTasksRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tasks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_CLOUD_TASKS_OPTIONS_H
diff --git a/google/cloud/tasks/mocks/mock_cloud_tasks_connection.h b/google/cloud/tasks/mocks/mock_cloud_tasks_connection.h
deleted file mode 100644
index d93c33b7b2733..0000000000000
--- a/google/cloud/tasks/mocks/mock_cloud_tasks_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tasks/v2/cloudtasks.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_MOCKS_MOCK_CLOUD_TASKS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_MOCKS_MOCK_CLOUD_TASKS_CONNECTION_H
-
-#include "google/cloud/tasks/cloud_tasks_connection.h"
-#include "google/cloud/tasks/v2/mocks/mock_cloud_tasks_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in tasks_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace tasks_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tasks_v2_mocks::MockCloudTasksConnection directly.
-using ::google::cloud::tasks_v2_mocks::MockCloudTasksConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tasks_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TASKS_MOCKS_MOCK_CLOUD_TASKS_CONNECTION_H
diff --git a/google/cloud/texttospeech/BUILD.bazel b/google/cloud/texttospeech/BUILD.bazel
index 304eb52f91f61..6454144ad675a 100644
--- a/google/cloud/texttospeech/BUILD.bazel
+++ b/google/cloud/texttospeech/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/texttospeech/CMakeLists.txt b/google/cloud/texttospeech/CMakeLists.txt
index 080dcedb32e4d..5535b0583c3d6 100644
--- a/google/cloud/texttospeech/CMakeLists.txt
+++ b/google/cloud/texttospeech/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     texttospeech "Cloud Text-to-Speech API"
-    SERVICE_DIRS "__EMPTY__" "v1/"
+    SERVICE_DIRS "v1/"
     BACKWARDS_COMPAT_PROTO_TARGETS "cloud_texttospeech_protos")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
diff --git a/google/cloud/texttospeech/mocks/mock_text_to_speech_connection.h b/google/cloud/texttospeech/mocks/mock_text_to_speech_connection.h
deleted file mode 100644
index 394b1166049ff..0000000000000
--- a/google/cloud/texttospeech/mocks/mock_text_to_speech_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/texttospeech/v1/cloud_tts.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_MOCKS_MOCK_TEXT_TO_SPEECH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_MOCKS_MOCK_TEXT_TO_SPEECH_CONNECTION_H
-
-#include "google/cloud/texttospeech/text_to_speech_connection.h"
-#include "google/cloud/texttospeech/v1/mocks/mock_text_to_speech_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in texttospeech_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace texttospeech_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use texttospeech_v1_mocks::MockTextToSpeechConnection directly.
-using ::google::cloud::texttospeech_v1_mocks::MockTextToSpeechConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace texttospeech_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_MOCKS_MOCK_TEXT_TO_SPEECH_CONNECTION_H
diff --git a/google/cloud/texttospeech/text_to_speech_client.h b/google/cloud/texttospeech/text_to_speech_client.h
deleted file mode 100644
index c05b03d8a3b6c..0000000000000
--- a/google/cloud/texttospeech/text_to_speech_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/texttospeech/v1/cloud_tts.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_CLIENT_H
-
-#include "google/cloud/texttospeech/text_to_speech_connection.h"
-#include "google/cloud/texttospeech/v1/text_to_speech_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in texttospeech_v1 instead of the aliases defined in
-///     this namespace.
-namespace texttospeech {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use texttospeech_v1::TextToSpeechClient directly.
-using ::google::cloud::texttospeech_v1::TextToSpeechClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace texttospeech
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_CLIENT_H
diff --git a/google/cloud/texttospeech/text_to_speech_connection.h b/google/cloud/texttospeech/text_to_speech_connection.h
deleted file mode 100644
index f05a635007bc9..0000000000000
--- a/google/cloud/texttospeech/text_to_speech_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/texttospeech/v1/cloud_tts.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_CONNECTION_H
-
-#include "google/cloud/texttospeech/text_to_speech_connection_idempotency_policy.h"
-#include "google/cloud/texttospeech/v1/text_to_speech_connection.h"
-
-namespace google {
-namespace cloud {
-namespace texttospeech {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use texttospeech_v1::MakeTextToSpeechConnection directly.
-using ::google::cloud::texttospeech_v1::MakeTextToSpeechConnection;
-
-/// @deprecated Use texttospeech_v1::TextToSpeechConnection directly.
-using ::google::cloud::texttospeech_v1::TextToSpeechConnection;
-
-/// @deprecated Use texttospeech_v1::TextToSpeechLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::texttospeech_v1::
-    TextToSpeechLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use texttospeech_v1::TextToSpeechLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::texttospeech_v1::TextToSpeechLimitedTimeRetryPolicy;
-
-/// @deprecated Use texttospeech_v1::TextToSpeechRetryPolicy directly.
-using ::google::cloud::texttospeech_v1::TextToSpeechRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace texttospeech
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_CONNECTION_H
diff --git a/google/cloud/texttospeech/text_to_speech_connection_idempotency_policy.h b/google/cloud/texttospeech/text_to_speech_connection_idempotency_policy.h
deleted file mode 100644
index 84263e946f763..0000000000000
--- a/google/cloud/texttospeech/text_to_speech_connection_idempotency_policy.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/texttospeech/v1/cloud_tts.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/texttospeech/v1/text_to_speech_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace texttospeech {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// texttospeech_v1::MakeDefaultTextToSpeechConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::texttospeech_v1::
-    MakeDefaultTextToSpeechConnectionIdempotencyPolicy;
-
-/// @deprecated Use texttospeech_v1::TextToSpeechConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::texttospeech_v1::TextToSpeechConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace texttospeech
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/texttospeech/text_to_speech_options.h b/google/cloud/texttospeech/text_to_speech_options.h
deleted file mode 100644
index 64753be7e04db..0000000000000
--- a/google/cloud/texttospeech/text_to_speech_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/texttospeech/v1/cloud_tts.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_OPTIONS_H
-
-#include "google/cloud/texttospeech/text_to_speech_connection.h"
-#include "google/cloud/texttospeech/text_to_speech_connection_idempotency_policy.h"
-#include "google/cloud/texttospeech/v1/text_to_speech_options.h"
-
-namespace google {
-namespace cloud {
-namespace texttospeech {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use texttospeech_v1::TextToSpeechBackoffPolicyOption directly.
-using ::google::cloud::texttospeech_v1::TextToSpeechBackoffPolicyOption;
-
-/// @deprecated Use
-/// texttospeech_v1::TextToSpeechConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::texttospeech_v1::
-    TextToSpeechConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use texttospeech_v1::TextToSpeechPolicyOptionList directly.
-using ::google::cloud::texttospeech_v1::TextToSpeechPolicyOptionList;
-
-/// @deprecated Use texttospeech_v1::TextToSpeechRetryPolicyOption directly.
-using ::google::cloud::texttospeech_v1::TextToSpeechRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace texttospeech
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TEXTTOSPEECH_TEXT_TO_SPEECH_OPTIONS_H
diff --git a/google/cloud/tpu/BUILD.bazel b/google/cloud/tpu/BUILD.bazel
index e56bf62d7d163..b50bd2439cc46 100644
--- a/google/cloud/tpu/BUILD.bazel
+++ b/google/cloud/tpu/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "v2/",
 ]
diff --git a/google/cloud/tpu/CMakeLists.txt b/google/cloud/tpu/CMakeLists.txt
index 38fde08179d22..1df1bad6d6ef5 100644
--- a/google/cloud/tpu/CMakeLists.txt
+++ b/google/cloud/tpu/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(tpu "Cloud TPU API" SERVICE_DIRS "__EMPTY__"
-                                                                    "v1/" "v2/")
+google_cloud_cpp_add_gapic_library(tpu "Cloud TPU API" SERVICE_DIRS "v1/" "v2/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(tpu_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/tpu/mocks/mock_tpu_connection.h b/google/cloud/tpu/mocks/mock_tpu_connection.h
deleted file mode 100644
index 8409ecff3c730..0000000000000
--- a/google/cloud/tpu/mocks/mock_tpu_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tpu/v1/cloud_tpu.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_MOCKS_MOCK_TPU_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_MOCKS_MOCK_TPU_CONNECTION_H
-
-#include "google/cloud/tpu/tpu_connection.h"
-#include "google/cloud/tpu/v1/mocks/mock_tpu_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in tpu_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace tpu_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tpu_v1_mocks::MockTpuConnection directly.
-using ::google::cloud::tpu_v1_mocks::MockTpuConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tpu_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_MOCKS_MOCK_TPU_CONNECTION_H
diff --git a/google/cloud/tpu/tpu_client.h b/google/cloud/tpu/tpu_client.h
deleted file mode 100644
index a222c4a6c950e..0000000000000
--- a/google/cloud/tpu/tpu_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tpu/v1/cloud_tpu.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_CLIENT_H
-
-#include "google/cloud/tpu/tpu_connection.h"
-#include "google/cloud/tpu/v1/tpu_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in tpu_v1 instead of the aliases defined in
-///     this namespace.
-namespace tpu {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tpu_v1::TpuClient directly.
-using ::google::cloud::tpu_v1::TpuClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tpu
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_CLIENT_H
diff --git a/google/cloud/tpu/tpu_connection.h b/google/cloud/tpu/tpu_connection.h
deleted file mode 100644
index 120cd44a2f55e..0000000000000
--- a/google/cloud/tpu/tpu_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tpu/v1/cloud_tpu.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_CONNECTION_H
-
-#include "google/cloud/tpu/tpu_connection_idempotency_policy.h"
-#include "google/cloud/tpu/v1/tpu_connection.h"
-
-namespace google {
-namespace cloud {
-namespace tpu {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tpu_v1::MakeTpuConnection directly.
-using ::google::cloud::tpu_v1::MakeTpuConnection;
-
-/// @deprecated Use tpu_v1::TpuConnection directly.
-using ::google::cloud::tpu_v1::TpuConnection;
-
-/// @deprecated Use tpu_v1::TpuLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::tpu_v1::TpuLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use tpu_v1::TpuLimitedTimeRetryPolicy directly.
-using ::google::cloud::tpu_v1::TpuLimitedTimeRetryPolicy;
-
-/// @deprecated Use tpu_v1::TpuRetryPolicy directly.
-using ::google::cloud::tpu_v1::TpuRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tpu
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_CONNECTION_H
diff --git a/google/cloud/tpu/tpu_connection_idempotency_policy.h b/google/cloud/tpu/tpu_connection_idempotency_policy.h
deleted file mode 100644
index 9b65c54d63a01..0000000000000
--- a/google/cloud/tpu/tpu_connection_idempotency_policy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tpu/v1/cloud_tpu.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/tpu/v1/tpu_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace tpu {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tpu_v1::MakeDefaultTpuConnectionIdempotencyPolicy directly.
-using ::google::cloud::tpu_v1::MakeDefaultTpuConnectionIdempotencyPolicy;
-
-/// @deprecated Use tpu_v1::TpuConnectionIdempotencyPolicy directly.
-using ::google::cloud::tpu_v1::TpuConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tpu
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/tpu/tpu_options.h b/google/cloud/tpu/tpu_options.h
deleted file mode 100644
index 3f25bc93de56d..0000000000000
--- a/google/cloud/tpu/tpu_options.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/tpu/v1/cloud_tpu.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_OPTIONS_H
-
-#include "google/cloud/tpu/tpu_connection.h"
-#include "google/cloud/tpu/tpu_connection_idempotency_policy.h"
-#include "google/cloud/tpu/v1/tpu_options.h"
-
-namespace google {
-namespace cloud {
-namespace tpu {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use tpu_v1::TpuPollingPolicyOption directly.
-using ::google::cloud::tpu_v1::TpuPollingPolicyOption;
-
-/// @deprecated Use tpu_v1::TpuBackoffPolicyOption directly.
-using ::google::cloud::tpu_v1::TpuBackoffPolicyOption;
-
-/// @deprecated Use tpu_v1::TpuConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::tpu_v1::TpuConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use tpu_v1::TpuPolicyOptionList directly.
-using ::google::cloud::tpu_v1::TpuPolicyOptionList;
-
-/// @deprecated Use tpu_v1::TpuRetryPolicyOption directly.
-using ::google::cloud::tpu_v1::TpuRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace tpu
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TPU_TPU_OPTIONS_H
diff --git a/google/cloud/trace/BUILD.bazel b/google/cloud/trace/BUILD.bazel
index 82421d887a104..f387f9b8a6418 100644
--- a/google/cloud/trace/BUILD.bazel
+++ b/google/cloud/trace/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
     "v2/",
 ]
diff --git a/google/cloud/trace/CMakeLists.txt b/google/cloud/trace/CMakeLists.txt
index a3af837c0c8e2..91294152c4f4d 100644
--- a/google/cloud/trace/CMakeLists.txt
+++ b/google/cloud/trace/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     trace "Cloud Trace API"
-    SERVICE_DIRS "__EMPTY__" "v1/" "v2/"
+    SERVICE_DIRS "v1/" "v2/"
     BACKWARDS_COMPAT_PROTO_TARGETS "devtools_cloudtrace_v2_trace_protos"
                                    "devtools_cloudtrace_v2_tracing_protos")
 
diff --git a/google/cloud/trace/mocks/mock_trace_connection.h b/google/cloud/trace/mocks/mock_trace_connection.h
deleted file mode 100644
index 576ca31de3c6b..0000000000000
--- a/google/cloud/trace/mocks/mock_trace_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudtrace/v2/tracing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_MOCKS_MOCK_TRACE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_MOCKS_MOCK_TRACE_CONNECTION_H
-
-#include "google/cloud/trace/trace_connection.h"
-#include "google/cloud/trace/v2/mocks/mock_trace_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in trace_v2_mocks instead of the aliases
-///     defined in this namespace.
-namespace trace_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use trace_v2_mocks::MockTraceServiceConnection directly.
-using ::google::cloud::trace_v2_mocks::MockTraceServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace trace_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_MOCKS_MOCK_TRACE_CONNECTION_H
diff --git a/google/cloud/trace/trace_client.h b/google/cloud/trace/trace_client.h
deleted file mode 100644
index af171379db9ba..0000000000000
--- a/google/cloud/trace/trace_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudtrace/v2/tracing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_CLIENT_H
-
-#include "google/cloud/trace/trace_connection.h"
-#include "google/cloud/trace/v2/trace_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in trace_v2 instead of the aliases defined in
-///     this namespace.
-namespace trace {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use trace_v2::TraceServiceClient directly.
-using ::google::cloud::trace_v2::TraceServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace trace
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_CLIENT_H
diff --git a/google/cloud/trace/trace_connection.h b/google/cloud/trace/trace_connection.h
deleted file mode 100644
index 2e35663928263..0000000000000
--- a/google/cloud/trace/trace_connection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudtrace/v2/tracing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_CONNECTION_H
-
-#include "google/cloud/trace/trace_connection_idempotency_policy.h"
-#include "google/cloud/trace/v2/trace_connection.h"
-
-namespace google {
-namespace cloud {
-namespace trace {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use trace_v2::MakeTraceServiceConnection directly.
-using ::google::cloud::trace_v2::MakeTraceServiceConnection;
-
-/// @deprecated Use trace_v2::TraceServiceConnection directly.
-using ::google::cloud::trace_v2::TraceServiceConnection;
-
-/// @deprecated Use trace_v2::TraceServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::trace_v2::TraceServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use trace_v2::TraceServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::trace_v2::TraceServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use trace_v2::TraceServiceRetryPolicy directly.
-using ::google::cloud::trace_v2::TraceServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace trace
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_CONNECTION_H
diff --git a/google/cloud/trace/trace_connection_idempotency_policy.h b/google/cloud/trace/trace_connection_idempotency_policy.h
deleted file mode 100644
index 657ec8b7c6fe7..0000000000000
--- a/google/cloud/trace/trace_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudtrace/v2/tracing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/trace/v2/trace_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace trace {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use trace_v2::MakeDefaultTraceServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::trace_v2::
-    MakeDefaultTraceServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use trace_v2::TraceServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::trace_v2::TraceServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace trace
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/trace/trace_options.h b/google/cloud/trace/trace_options.h
deleted file mode 100644
index b37c628b8ef50..0000000000000
--- a/google/cloud/trace/trace_options.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/devtools/cloudtrace/v2/tracing.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_OPTIONS_H
-
-#include "google/cloud/trace/trace_connection.h"
-#include "google/cloud/trace/trace_connection_idempotency_policy.h"
-#include "google/cloud/trace/v2/trace_options.h"
-
-namespace google {
-namespace cloud {
-namespace trace {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use trace_v2::TraceServiceBackoffPolicyOption directly.
-using ::google::cloud::trace_v2::TraceServiceBackoffPolicyOption;
-
-/// @deprecated Use trace_v2::TraceServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::trace_v2::TraceServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use trace_v2::TraceServicePolicyOptionList directly.
-using ::google::cloud::trace_v2::TraceServicePolicyOptionList;
-
-/// @deprecated Use trace_v2::TraceServiceRetryPolicyOption directly.
-using ::google::cloud::trace_v2::TraceServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace trace
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRACE_TRACE_OPTIONS_H
diff --git a/google/cloud/translate/BUILD.bazel b/google/cloud/translate/BUILD.bazel
index 0bf766a185558..5724a52753401 100644
--- a/google/cloud/translate/BUILD.bazel
+++ b/google/cloud/translate/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v3/",
 ]
 
diff --git a/google/cloud/translate/CMakeLists.txt b/google/cloud/translate/CMakeLists.txt
index 1c85c4b71aad6..794e4452062b2 100644
--- a/google/cloud/translate/CMakeLists.txt
+++ b/google/cloud/translate/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(translate "Cloud Translation API"
-                                   SERVICE_DIRS "__EMPTY__" "v3/")
+                                   SERVICE_DIRS "v3/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(translate_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/translate/mocks/mock_translation_connection.h b/google/cloud/translate/mocks/mock_translation_connection.h
deleted file mode 100644
index df8a8775fb284..0000000000000
--- a/google/cloud/translate/mocks/mock_translation_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/translate/v3/translation_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_MOCKS_MOCK_TRANSLATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_MOCKS_MOCK_TRANSLATION_CONNECTION_H
-
-#include "google/cloud/translate/translation_connection.h"
-#include "google/cloud/translate/v3/mocks/mock_translation_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in translate_v3_mocks instead of the aliases
-///     defined in this namespace.
-namespace translate_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use translate_v3_mocks::MockTranslationServiceConnection
-/// directly.
-using ::google::cloud::translate_v3_mocks::MockTranslationServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace translate_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_MOCKS_MOCK_TRANSLATION_CONNECTION_H
diff --git a/google/cloud/translate/translation_client.h b/google/cloud/translate/translation_client.h
deleted file mode 100644
index d130c5ee2e641..0000000000000
--- a/google/cloud/translate/translation_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/translate/v3/translation_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_CLIENT_H
-
-#include "google/cloud/translate/translation_connection.h"
-#include "google/cloud/translate/v3/translation_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in translate_v3 instead of the aliases defined in
-///     this namespace.
-namespace translate {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use translate_v3::TranslationServiceClient directly.
-using ::google::cloud::translate_v3::TranslationServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace translate
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_CLIENT_H
diff --git a/google/cloud/translate/translation_connection.h b/google/cloud/translate/translation_connection.h
deleted file mode 100644
index 0558e1e4dd7b5..0000000000000
--- a/google/cloud/translate/translation_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/translate/v3/translation_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_CONNECTION_H
-
-#include "google/cloud/translate/translation_connection_idempotency_policy.h"
-#include "google/cloud/translate/v3/translation_connection.h"
-
-namespace google {
-namespace cloud {
-namespace translate {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use translate_v3::MakeTranslationServiceConnection directly.
-using ::google::cloud::translate_v3::MakeTranslationServiceConnection;
-
-/// @deprecated Use translate_v3::TranslationServiceConnection directly.
-using ::google::cloud::translate_v3::TranslationServiceConnection;
-
-/// @deprecated Use translate_v3::TranslationServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::translate_v3::
-    TranslationServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use translate_v3::TranslationServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::translate_v3::TranslationServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use translate_v3::TranslationServiceRetryPolicy directly.
-using ::google::cloud::translate_v3::TranslationServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace translate
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_CONNECTION_H
diff --git a/google/cloud/translate/translation_connection_idempotency_policy.h b/google/cloud/translate/translation_connection_idempotency_policy.h
deleted file mode 100644
index 442252b2e6af6..0000000000000
--- a/google/cloud/translate/translation_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/translate/v3/translation_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/translate/v3/translation_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace translate {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// translate_v3::MakeDefaultTranslationServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::translate_v3::
-    MakeDefaultTranslationServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use translate_v3::TranslationServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::translate_v3::
-    TranslationServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace translate
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/translate/translation_options.h b/google/cloud/translate/translation_options.h
deleted file mode 100644
index 35051f89a85b9..0000000000000
--- a/google/cloud/translate/translation_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/translate/v3/translation_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_OPTIONS_H
-
-#include "google/cloud/translate/translation_connection.h"
-#include "google/cloud/translate/translation_connection_idempotency_policy.h"
-#include "google/cloud/translate/v3/translation_options.h"
-
-namespace google {
-namespace cloud {
-namespace translate {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use translate_v3::TranslationServicePollingPolicyOption
-/// directly.
-using ::google::cloud::translate_v3::TranslationServicePollingPolicyOption;
-
-/// @deprecated Use translate_v3::TranslationServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::translate_v3::TranslationServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// translate_v3::TranslationServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::translate_v3::
-    TranslationServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use translate_v3::TranslationServicePolicyOptionList directly.
-using ::google::cloud::translate_v3::TranslationServicePolicyOptionList;
-
-/// @deprecated Use translate_v3::TranslationServiceRetryPolicyOption directly.
-using ::google::cloud::translate_v3::TranslationServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace translate
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_TRANSLATE_TRANSLATION_OPTIONS_H
diff --git a/google/cloud/video/BUILD.bazel b/google/cloud/video/BUILD.bazel
index de59b60b1aba5..410a732725fc2 100644
--- a/google/cloud/video/BUILD.bazel
+++ b/google/cloud/video/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "livestream/v1/",
     "stitcher/v1/",
     "transcoder/v1/",
diff --git a/google/cloud/video/CMakeLists.txt b/google/cloud/video/CMakeLists.txt
index 133bebb28ce9e..3ee56bdf414b1 100644
--- a/google/cloud/video/CMakeLists.txt
+++ b/google/cloud/video/CMakeLists.txt
@@ -18,7 +18,7 @@ include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
     video "A C++ Client Library for several Video Services"
-    SERVICE_DIRS "__EMPTY__" "livestream/v1/" "stitcher/v1/" "transcoder/v1/")
+    SERVICE_DIRS "livestream/v1/" "stitcher/v1/" "transcoder/v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(video_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/video/livestream_client.h b/google/cloud/video/livestream_client.h
deleted file mode 100644
index b14706665cf6d..0000000000000
--- a/google/cloud/video/livestream_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/livestream/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_CLIENT_H
-
-#include "google/cloud/video/livestream/v1/livestream_client.h"
-#include "google/cloud/video/livestream_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in video_livestream_v1 instead of the aliases defined in
-///     this namespace.
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_livestream_v1::LivestreamServiceClient directly.
-using ::google::cloud::video_livestream_v1::LivestreamServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_CLIENT_H
diff --git a/google/cloud/video/livestream_connection.h b/google/cloud/video/livestream_connection.h
deleted file mode 100644
index e83060959d68b..0000000000000
--- a/google/cloud/video/livestream_connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/livestream/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_CONNECTION_H
-
-#include "google/cloud/video/livestream/v1/livestream_connection.h"
-#include "google/cloud/video/livestream_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_livestream_v1::MakeLivestreamServiceConnection
-/// directly.
-using ::google::cloud::video_livestream_v1::MakeLivestreamServiceConnection;
-
-/// @deprecated Use video_livestream_v1::LivestreamServiceConnection directly.
-using ::google::cloud::video_livestream_v1::LivestreamServiceConnection;
-
-/// @deprecated Use
-/// video_livestream_v1::LivestreamServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::video_livestream_v1::
-    LivestreamServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use video_livestream_v1::LivestreamServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::video_livestream_v1::
-    LivestreamServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use video_livestream_v1::LivestreamServiceRetryPolicy directly.
-using ::google::cloud::video_livestream_v1::LivestreamServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_CONNECTION_H
diff --git a/google/cloud/video/livestream_connection_idempotency_policy.h b/google/cloud/video/livestream_connection_idempotency_policy.h
deleted file mode 100644
index beb1880a11dfd..0000000000000
--- a/google/cloud/video/livestream_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/livestream/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/video/livestream/v1/livestream_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// video_livestream_v1::MakeDefaultLivestreamServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::video_livestream_v1::
-    MakeDefaultLivestreamServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// video_livestream_v1::LivestreamServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::video_livestream_v1::
-    LivestreamServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/video/livestream_options.h b/google/cloud/video/livestream_options.h
deleted file mode 100644
index 4c4d8577e9236..0000000000000
--- a/google/cloud/video/livestream_options.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/livestream/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_OPTIONS_H
-
-#include "google/cloud/video/livestream/v1/livestream_options.h"
-#include "google/cloud/video/livestream_connection.h"
-#include "google/cloud/video/livestream_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_livestream_v1::LivestreamServicePollingPolicyOption
-/// directly.
-using ::google::cloud::video_livestream_v1::
-    LivestreamServicePollingPolicyOption;
-
-/// @deprecated Use video_livestream_v1::LivestreamServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::video_livestream_v1::
-    LivestreamServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// video_livestream_v1::LivestreamServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::video_livestream_v1::
-    LivestreamServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use video_livestream_v1::LivestreamServicePolicyOptionList
-/// directly.
-using ::google::cloud::video_livestream_v1::LivestreamServicePolicyOptionList;
-
-/// @deprecated Use video_livestream_v1::LivestreamServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::video_livestream_v1::LivestreamServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_LIVESTREAM_OPTIONS_H
diff --git a/google/cloud/video/mocks/mock_livestream_connection.h b/google/cloud/video/mocks/mock_livestream_connection.h
deleted file mode 100644
index cb1936dadbae3..0000000000000
--- a/google/cloud/video/mocks/mock_livestream_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/livestream/v1/service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_MOCKS_MOCK_LIVESTREAM_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_MOCKS_MOCK_LIVESTREAM_CONNECTION_H
-
-#include "google/cloud/video/livestream/v1/mocks/mock_livestream_connection.h"
-#include "google/cloud/video/livestream_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in video_livestream_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace video_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_livestream_v1_mocks::MockLivestreamServiceConnection
-/// directly.
-using ::google::cloud::video_livestream_v1_mocks::
-    MockLivestreamServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_MOCKS_MOCK_LIVESTREAM_CONNECTION_H
diff --git a/google/cloud/video/mocks/mock_transcoder_connection.h b/google/cloud/video/mocks/mock_transcoder_connection.h
deleted file mode 100644
index 89ef017dc4dc3..0000000000000
--- a/google/cloud/video/mocks/mock_transcoder_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/transcoder/v1/services.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_MOCKS_MOCK_TRANSCODER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_MOCKS_MOCK_TRANSCODER_CONNECTION_H
-
-#include "google/cloud/video/transcoder/v1/mocks/mock_transcoder_connection.h"
-#include "google/cloud/video/transcoder_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in video_transcoder_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace video_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_transcoder_v1_mocks::MockTranscoderServiceConnection
-/// directly.
-using ::google::cloud::video_transcoder_v1_mocks::
-    MockTranscoderServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_MOCKS_MOCK_TRANSCODER_CONNECTION_H
diff --git a/google/cloud/video/mocks/mock_video_stitcher_connection.h b/google/cloud/video/mocks/mock_video_stitcher_connection.h
deleted file mode 100644
index 2cff109b83ab4..0000000000000
--- a/google/cloud/video/mocks/mock_video_stitcher_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/stitcher/v1/video_stitcher_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_MOCKS_MOCK_VIDEO_STITCHER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_MOCKS_MOCK_VIDEO_STITCHER_CONNECTION_H
-
-#include "google/cloud/video/stitcher/v1/mocks/mock_video_stitcher_connection.h"
-#include "google/cloud/video/video_stitcher_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in video_stitcher_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace video_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_stitcher_v1_mocks::MockVideoStitcherServiceConnection
-/// directly.
-using ::google::cloud::video_stitcher_v1_mocks::
-    MockVideoStitcherServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_MOCKS_MOCK_VIDEO_STITCHER_CONNECTION_H
diff --git a/google/cloud/video/transcoder_client.h b/google/cloud/video/transcoder_client.h
deleted file mode 100644
index bc92b7666ad53..0000000000000
--- a/google/cloud/video/transcoder_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/transcoder/v1/services.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_CLIENT_H
-
-#include "google/cloud/video/transcoder/v1/transcoder_client.h"
-#include "google/cloud/video/transcoder_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in video_transcoder_v1 instead of the aliases defined in
-///     this namespace.
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_transcoder_v1::TranscoderServiceClient directly.
-using ::google::cloud::video_transcoder_v1::TranscoderServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_CLIENT_H
diff --git a/google/cloud/video/transcoder_connection.h b/google/cloud/video/transcoder_connection.h
deleted file mode 100644
index 5cbe3ff2dff96..0000000000000
--- a/google/cloud/video/transcoder_connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/transcoder/v1/services.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_CONNECTION_H
-
-#include "google/cloud/video/transcoder/v1/transcoder_connection.h"
-#include "google/cloud/video/transcoder_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_transcoder_v1::MakeTranscoderServiceConnection
-/// directly.
-using ::google::cloud::video_transcoder_v1::MakeTranscoderServiceConnection;
-
-/// @deprecated Use video_transcoder_v1::TranscoderServiceConnection directly.
-using ::google::cloud::video_transcoder_v1::TranscoderServiceConnection;
-
-/// @deprecated Use
-/// video_transcoder_v1::TranscoderServiceLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::video_transcoder_v1::
-    TranscoderServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use video_transcoder_v1::TranscoderServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::video_transcoder_v1::
-    TranscoderServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use video_transcoder_v1::TranscoderServiceRetryPolicy directly.
-using ::google::cloud::video_transcoder_v1::TranscoderServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_CONNECTION_H
diff --git a/google/cloud/video/transcoder_connection_idempotency_policy.h b/google/cloud/video/transcoder_connection_idempotency_policy.h
deleted file mode 100644
index 3a2f147d15a22..0000000000000
--- a/google/cloud/video/transcoder_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/transcoder/v1/services.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/video/transcoder/v1/transcoder_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// video_transcoder_v1::MakeDefaultTranscoderServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::video_transcoder_v1::
-    MakeDefaultTranscoderServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// video_transcoder_v1::TranscoderServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::video_transcoder_v1::
-    TranscoderServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/video/transcoder_options.h b/google/cloud/video/transcoder_options.h
deleted file mode 100644
index a23161a033a0d..0000000000000
--- a/google/cloud/video/transcoder_options.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/transcoder/v1/services.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_OPTIONS_H
-
-#include "google/cloud/video/transcoder/v1/transcoder_options.h"
-#include "google/cloud/video/transcoder_connection.h"
-#include "google/cloud/video/transcoder_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_transcoder_v1::TranscoderServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::video_transcoder_v1::
-    TranscoderServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// video_transcoder_v1::TranscoderServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::video_transcoder_v1::
-    TranscoderServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use video_transcoder_v1::TranscoderServicePolicyOptionList
-/// directly.
-using ::google::cloud::video_transcoder_v1::TranscoderServicePolicyOptionList;
-
-/// @deprecated Use video_transcoder_v1::TranscoderServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::video_transcoder_v1::TranscoderServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_TRANSCODER_OPTIONS_H
diff --git a/google/cloud/video/video_stitcher_client.h b/google/cloud/video/video_stitcher_client.h
deleted file mode 100644
index 116e866ec9cfe..0000000000000
--- a/google/cloud/video/video_stitcher_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/stitcher/v1/video_stitcher_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_CLIENT_H
-
-#include "google/cloud/video/stitcher/v1/video_stitcher_client.h"
-#include "google/cloud/video/video_stitcher_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in video_stitcher_v1 instead of the aliases defined in
-///     this namespace.
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_stitcher_v1::VideoStitcherServiceClient directly.
-using ::google::cloud::video_stitcher_v1::VideoStitcherServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_CLIENT_H
diff --git a/google/cloud/video/video_stitcher_connection.h b/google/cloud/video/video_stitcher_connection.h
deleted file mode 100644
index d6f5869731038..0000000000000
--- a/google/cloud/video/video_stitcher_connection.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/stitcher/v1/video_stitcher_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_CONNECTION_H
-
-#include "google/cloud/video/stitcher/v1/video_stitcher_connection.h"
-#include "google/cloud/video/video_stitcher_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_stitcher_v1::MakeVideoStitcherServiceConnection
-/// directly.
-using ::google::cloud::video_stitcher_v1::MakeVideoStitcherServiceConnection;
-
-/// @deprecated Use video_stitcher_v1::VideoStitcherServiceConnection directly.
-using ::google::cloud::video_stitcher_v1::VideoStitcherServiceConnection;
-
-/// @deprecated Use
-/// video_stitcher_v1::VideoStitcherServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::video_stitcher_v1::
-    VideoStitcherServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// video_stitcher_v1::VideoStitcherServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::video_stitcher_v1::
-    VideoStitcherServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use video_stitcher_v1::VideoStitcherServiceRetryPolicy directly.
-using ::google::cloud::video_stitcher_v1::VideoStitcherServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_CONNECTION_H
diff --git a/google/cloud/video/video_stitcher_connection_idempotency_policy.h b/google/cloud/video/video_stitcher_connection_idempotency_policy.h
deleted file mode 100644
index 03f79a180c4c1..0000000000000
--- a/google/cloud/video/video_stitcher_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/stitcher/v1/video_stitcher_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/video/stitcher/v1/video_stitcher_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// video_stitcher_v1::MakeDefaultVideoStitcherServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::video_stitcher_v1::
-    MakeDefaultVideoStitcherServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// video_stitcher_v1::VideoStitcherServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::video_stitcher_v1::
-    VideoStitcherServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/video/video_stitcher_options.h b/google/cloud/video/video_stitcher_options.h
deleted file mode 100644
index d8c185ce006e4..0000000000000
--- a/google/cloud/video/video_stitcher_options.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/video/stitcher/v1/video_stitcher_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_OPTIONS_H
-
-#include "google/cloud/video/stitcher/v1/video_stitcher_options.h"
-#include "google/cloud/video/video_stitcher_connection.h"
-#include "google/cloud/video/video_stitcher_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace video {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use video_stitcher_v1::VideoStitcherServicePollingPolicyOption
-/// directly.
-using ::google::cloud::video_stitcher_v1::
-    VideoStitcherServicePollingPolicyOption;
-
-/// @deprecated Use video_stitcher_v1::VideoStitcherServiceBackoffPolicyOption
-/// directly.
-using ::google::cloud::video_stitcher_v1::
-    VideoStitcherServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// video_stitcher_v1::VideoStitcherServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::video_stitcher_v1::
-    VideoStitcherServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use video_stitcher_v1::VideoStitcherServicePolicyOptionList
-/// directly.
-using ::google::cloud::video_stitcher_v1::VideoStitcherServicePolicyOptionList;
-
-/// @deprecated Use video_stitcher_v1::VideoStitcherServiceRetryPolicyOption
-/// directly.
-using ::google::cloud::video_stitcher_v1::VideoStitcherServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace video
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEO_VIDEO_STITCHER_OPTIONS_H
diff --git a/google/cloud/videointelligence/BUILD.bazel b/google/cloud/videointelligence/BUILD.bazel
index 0899dcaedd51e..4d2ea13e9fc55 100644
--- a/google/cloud/videointelligence/BUILD.bazel
+++ b/google/cloud/videointelligence/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/videointelligence/CMakeLists.txt b/google/cloud/videointelligence/CMakeLists.txt
index 1091b26fa5939..d901774374835 100644
--- a/google/cloud/videointelligence/CMakeLists.txt
+++ b/google/cloud/videointelligence/CMakeLists.txt
@@ -17,8 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(
-    videointelligence "Cloud Video Intelligence API" SERVICE_DIRS "__EMPTY__"
-                                                                  "v1/")
+    videointelligence "Cloud Video Intelligence API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(videointelligence_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/videointelligence/mocks/mock_video_intelligence_connection.h b/google/cloud/videointelligence/mocks/mock_video_intelligence_connection.h
deleted file mode 100644
index fc79bbb2e43f9..0000000000000
--- a/google/cloud/videointelligence/mocks/mock_video_intelligence_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/videointelligence/v1/video_intelligence.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_MOCKS_MOCK_VIDEO_INTELLIGENCE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_MOCKS_MOCK_VIDEO_INTELLIGENCE_CONNECTION_H
-
-#include "google/cloud/videointelligence/v1/mocks/mock_video_intelligence_connection.h"
-#include "google/cloud/videointelligence/video_intelligence_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in videointelligence_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace videointelligence_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// videointelligence_v1_mocks::MockVideoIntelligenceServiceConnection directly.
-using ::google::cloud::videointelligence_v1_mocks::
-    MockVideoIntelligenceServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace videointelligence_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_MOCKS_MOCK_VIDEO_INTELLIGENCE_CONNECTION_H
diff --git a/google/cloud/videointelligence/video_intelligence_client.h b/google/cloud/videointelligence/video_intelligence_client.h
deleted file mode 100644
index 0b0415239afb1..0000000000000
--- a/google/cloud/videointelligence/video_intelligence_client.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/videointelligence/v1/video_intelligence.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_CLIENT_H
-
-#include "google/cloud/videointelligence/v1/video_intelligence_client.h"
-#include "google/cloud/videointelligence/video_intelligence_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in videointelligence_v1 instead of the aliases defined in
-///     this namespace.
-namespace videointelligence {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use videointelligence_v1::VideoIntelligenceServiceClient
-/// directly.
-using ::google::cloud::videointelligence_v1::VideoIntelligenceServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace videointelligence
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_CLIENT_H
diff --git a/google/cloud/videointelligence/video_intelligence_connection.h b/google/cloud/videointelligence/video_intelligence_connection.h
deleted file mode 100644
index 5e99873838daf..0000000000000
--- a/google/cloud/videointelligence/video_intelligence_connection.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/videointelligence/v1/video_intelligence.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_CONNECTION_H
-
-#include "google/cloud/videointelligence/v1/video_intelligence_connection.h"
-#include "google/cloud/videointelligence/video_intelligence_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace videointelligence {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use videointelligence_v1::MakeVideoIntelligenceServiceConnection
-/// directly.
-using ::google::cloud::videointelligence_v1::
-    MakeVideoIntelligenceServiceConnection;
-
-/// @deprecated Use videointelligence_v1::VideoIntelligenceServiceConnection
-/// directly.
-using ::google::cloud::videointelligence_v1::VideoIntelligenceServiceConnection;
-
-/// @deprecated Use
-/// videointelligence_v1::VideoIntelligenceServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::videointelligence_v1::
-    VideoIntelligenceServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// videointelligence_v1::VideoIntelligenceServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::videointelligence_v1::
-    VideoIntelligenceServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use videointelligence_v1::VideoIntelligenceServiceRetryPolicy
-/// directly.
-using ::google::cloud::videointelligence_v1::
-    VideoIntelligenceServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace videointelligence
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_CONNECTION_H
diff --git a/google/cloud/videointelligence/video_intelligence_connection_idempotency_policy.h b/google/cloud/videointelligence/video_intelligence_connection_idempotency_policy.h
deleted file mode 100644
index 509e6085d0edd..0000000000000
--- a/google/cloud/videointelligence/video_intelligence_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/videointelligence/v1/video_intelligence.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/videointelligence/v1/video_intelligence_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace videointelligence {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// videointelligence_v1::MakeDefaultVideoIntelligenceServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::videointelligence_v1::
-    MakeDefaultVideoIntelligenceServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// videointelligence_v1::VideoIntelligenceServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::videointelligence_v1::
-    VideoIntelligenceServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace videointelligence
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/videointelligence/video_intelligence_options.h b/google/cloud/videointelligence/video_intelligence_options.h
deleted file mode 100644
index cb6d266b6656a..0000000000000
--- a/google/cloud/videointelligence/video_intelligence_options.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/videointelligence/v1/video_intelligence.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_OPTIONS_H
-
-#include "google/cloud/videointelligence/v1/video_intelligence_options.h"
-#include "google/cloud/videointelligence/video_intelligence_connection.h"
-#include "google/cloud/videointelligence/video_intelligence_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace videointelligence {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// videointelligence_v1::VideoIntelligenceServicePollingPolicyOption directly.
-using ::google::cloud::videointelligence_v1::
-    VideoIntelligenceServicePollingPolicyOption;
-
-/// @deprecated Use
-/// videointelligence_v1::VideoIntelligenceServiceBackoffPolicyOption directly.
-using ::google::cloud::videointelligence_v1::
-    VideoIntelligenceServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// videointelligence_v1::VideoIntelligenceServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::videointelligence_v1::
-    VideoIntelligenceServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use
-/// videointelligence_v1::VideoIntelligenceServicePolicyOptionList directly.
-using ::google::cloud::videointelligence_v1::
-    VideoIntelligenceServicePolicyOptionList;
-
-/// @deprecated Use
-/// videointelligence_v1::VideoIntelligenceServiceRetryPolicyOption directly.
-using ::google::cloud::videointelligence_v1::
-    VideoIntelligenceServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace videointelligence
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VIDEOINTELLIGENCE_VIDEO_INTELLIGENCE_OPTIONS_H
diff --git a/google/cloud/vision/BUILD.bazel b/google/cloud/vision/BUILD.bazel
index 234f788a2d292..ffd4215983416 100644
--- a/google/cloud/vision/BUILD.bazel
+++ b/google/cloud/vision/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/vision/CMakeLists.txt b/google/cloud/vision/CMakeLists.txt
index a12765b63e933..6358d65d43a68 100644
--- a/google/cloud/vision/CMakeLists.txt
+++ b/google/cloud/vision/CMakeLists.txt
@@ -16,8 +16,7 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(vision "Cloud Vision API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+google_cloud_cpp_add_gapic_library(vision "Cloud Vision API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(vision_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/vision/image_annotator_client.h b/google/cloud/vision/image_annotator_client.h
deleted file mode 100644
index f4bb8f0f64ed8..0000000000000
--- a/google/cloud/vision/image_annotator_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/image_annotator.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_CLIENT_H
-
-#include "google/cloud/vision/image_annotator_connection.h"
-#include "google/cloud/vision/v1/image_annotator_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in vision_v1 instead of the aliases defined in
-///     this namespace.
-namespace vision {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vision_v1::ImageAnnotatorClient directly.
-using ::google::cloud::vision_v1::ImageAnnotatorClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_CLIENT_H
diff --git a/google/cloud/vision/image_annotator_connection.h b/google/cloud/vision/image_annotator_connection.h
deleted file mode 100644
index 431146d49a096..0000000000000
--- a/google/cloud/vision/image_annotator_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/image_annotator.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_CONNECTION_H
-
-#include "google/cloud/vision/image_annotator_connection_idempotency_policy.h"
-#include "google/cloud/vision/v1/image_annotator_connection.h"
-
-namespace google {
-namespace cloud {
-namespace vision {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vision_v1::MakeImageAnnotatorConnection directly.
-using ::google::cloud::vision_v1::MakeImageAnnotatorConnection;
-
-/// @deprecated Use vision_v1::ImageAnnotatorConnection directly.
-using ::google::cloud::vision_v1::ImageAnnotatorConnection;
-
-/// @deprecated Use vision_v1::ImageAnnotatorLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::vision_v1::ImageAnnotatorLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use vision_v1::ImageAnnotatorLimitedTimeRetryPolicy directly.
-using ::google::cloud::vision_v1::ImageAnnotatorLimitedTimeRetryPolicy;
-
-/// @deprecated Use vision_v1::ImageAnnotatorRetryPolicy directly.
-using ::google::cloud::vision_v1::ImageAnnotatorRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_CONNECTION_H
diff --git a/google/cloud/vision/image_annotator_connection_idempotency_policy.h b/google/cloud/vision/image_annotator_connection_idempotency_policy.h
deleted file mode 100644
index 5c34cdbc50da5..0000000000000
--- a/google/cloud/vision/image_annotator_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/image_annotator.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/vision/v1/image_annotator_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace vision {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// vision_v1::MakeDefaultImageAnnotatorConnectionIdempotencyPolicy directly.
-using ::google::cloud::vision_v1::
-    MakeDefaultImageAnnotatorConnectionIdempotencyPolicy;
-
-/// @deprecated Use vision_v1::ImageAnnotatorConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::vision_v1::ImageAnnotatorConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/vision/image_annotator_options.h b/google/cloud/vision/image_annotator_options.h
deleted file mode 100644
index 48dffc0294b59..0000000000000
--- a/google/cloud/vision/image_annotator_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/image_annotator.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_OPTIONS_H
-
-#include "google/cloud/vision/image_annotator_connection.h"
-#include "google/cloud/vision/image_annotator_connection_idempotency_policy.h"
-#include "google/cloud/vision/v1/image_annotator_options.h"
-
-namespace google {
-namespace cloud {
-namespace vision {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vision_v1::ImageAnnotatorPollingPolicyOption directly.
-using ::google::cloud::vision_v1::ImageAnnotatorPollingPolicyOption;
-
-/// @deprecated Use vision_v1::ImageAnnotatorBackoffPolicyOption directly.
-using ::google::cloud::vision_v1::ImageAnnotatorBackoffPolicyOption;
-
-/// @deprecated Use vision_v1::ImageAnnotatorConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::vision_v1::
-    ImageAnnotatorConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use vision_v1::ImageAnnotatorPolicyOptionList directly.
-using ::google::cloud::vision_v1::ImageAnnotatorPolicyOptionList;
-
-/// @deprecated Use vision_v1::ImageAnnotatorRetryPolicyOption directly.
-using ::google::cloud::vision_v1::ImageAnnotatorRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_IMAGE_ANNOTATOR_OPTIONS_H
diff --git a/google/cloud/vision/mocks/mock_image_annotator_connection.h b/google/cloud/vision/mocks/mock_image_annotator_connection.h
deleted file mode 100644
index af746fab270a2..0000000000000
--- a/google/cloud/vision/mocks/mock_image_annotator_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/image_annotator.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_MOCKS_MOCK_IMAGE_ANNOTATOR_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_MOCKS_MOCK_IMAGE_ANNOTATOR_CONNECTION_H
-
-#include "google/cloud/vision/image_annotator_connection.h"
-#include "google/cloud/vision/v1/mocks/mock_image_annotator_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in vision_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace vision_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vision_v1_mocks::MockImageAnnotatorConnection directly.
-using ::google::cloud::vision_v1_mocks::MockImageAnnotatorConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_MOCKS_MOCK_IMAGE_ANNOTATOR_CONNECTION_H
diff --git a/google/cloud/vision/mocks/mock_product_search_connection.h b/google/cloud/vision/mocks/mock_product_search_connection.h
deleted file mode 100644
index ed203a62156f0..0000000000000
--- a/google/cloud/vision/mocks/mock_product_search_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/product_search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_MOCKS_MOCK_PRODUCT_SEARCH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_MOCKS_MOCK_PRODUCT_SEARCH_CONNECTION_H
-
-#include "google/cloud/vision/product_search_connection.h"
-#include "google/cloud/vision/v1/mocks/mock_product_search_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in vision_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace vision_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vision_v1_mocks::MockProductSearchConnection directly.
-using ::google::cloud::vision_v1_mocks::MockProductSearchConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_MOCKS_MOCK_PRODUCT_SEARCH_CONNECTION_H
diff --git a/google/cloud/vision/product_search_client.h b/google/cloud/vision/product_search_client.h
deleted file mode 100644
index baa463ca621f7..0000000000000
--- a/google/cloud/vision/product_search_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/product_search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_CLIENT_H
-
-#include "google/cloud/vision/product_search_connection.h"
-#include "google/cloud/vision/v1/product_search_client.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in vision_v1 instead of the aliases defined in
-///     this namespace.
-namespace vision {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vision_v1::ProductSearchClient directly.
-using ::google::cloud::vision_v1::ProductSearchClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_CLIENT_H
diff --git a/google/cloud/vision/product_search_connection.h b/google/cloud/vision/product_search_connection.h
deleted file mode 100644
index eb4368d25c71d..0000000000000
--- a/google/cloud/vision/product_search_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/product_search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_CONNECTION_H
-
-#include "google/cloud/vision/product_search_connection_idempotency_policy.h"
-#include "google/cloud/vision/v1/product_search_connection.h"
-
-namespace google {
-namespace cloud {
-namespace vision {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vision_v1::MakeProductSearchConnection directly.
-using ::google::cloud::vision_v1::MakeProductSearchConnection;
-
-/// @deprecated Use vision_v1::ProductSearchConnection directly.
-using ::google::cloud::vision_v1::ProductSearchConnection;
-
-/// @deprecated Use vision_v1::ProductSearchLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::vision_v1::ProductSearchLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use vision_v1::ProductSearchLimitedTimeRetryPolicy directly.
-using ::google::cloud::vision_v1::ProductSearchLimitedTimeRetryPolicy;
-
-/// @deprecated Use vision_v1::ProductSearchRetryPolicy directly.
-using ::google::cloud::vision_v1::ProductSearchRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_CONNECTION_H
diff --git a/google/cloud/vision/product_search_connection_idempotency_policy.h b/google/cloud/vision/product_search_connection_idempotency_policy.h
deleted file mode 100644
index 03407539fac98..0000000000000
--- a/google/cloud/vision/product_search_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/product_search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/vision/v1/product_search_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace vision {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// vision_v1::MakeDefaultProductSearchConnectionIdempotencyPolicy directly.
-using ::google::cloud::vision_v1::
-    MakeDefaultProductSearchConnectionIdempotencyPolicy;
-
-/// @deprecated Use vision_v1::ProductSearchConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::vision_v1::ProductSearchConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/vision/product_search_options.h b/google/cloud/vision/product_search_options.h
deleted file mode 100644
index b1554eff263c7..0000000000000
--- a/google/cloud/vision/product_search_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vision/v1/product_search_service.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_OPTIONS_H
-
-#include "google/cloud/vision/product_search_connection.h"
-#include "google/cloud/vision/product_search_connection_idempotency_policy.h"
-#include "google/cloud/vision/v1/product_search_options.h"
-
-namespace google {
-namespace cloud {
-namespace vision {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vision_v1::ProductSearchPollingPolicyOption directly.
-using ::google::cloud::vision_v1::ProductSearchPollingPolicyOption;
-
-/// @deprecated Use vision_v1::ProductSearchBackoffPolicyOption directly.
-using ::google::cloud::vision_v1::ProductSearchBackoffPolicyOption;
-
-/// @deprecated Use vision_v1::ProductSearchConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::vision_v1::
-    ProductSearchConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use vision_v1::ProductSearchPolicyOptionList directly.
-using ::google::cloud::vision_v1::ProductSearchPolicyOptionList;
-
-/// @deprecated Use vision_v1::ProductSearchRetryPolicyOption directly.
-using ::google::cloud::vision_v1::ProductSearchRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vision
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VISION_PRODUCT_SEARCH_OPTIONS_H
diff --git a/google/cloud/vmmigration/BUILD.bazel b/google/cloud/vmmigration/BUILD.bazel
index 1a054def4f03a..826ebd0e26375 100644
--- a/google/cloud/vmmigration/BUILD.bazel
+++ b/google/cloud/vmmigration/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/vmmigration/CMakeLists.txt b/google/cloud/vmmigration/CMakeLists.txt
index 25580e32d6f59..cbdaf43a66527 100644
--- a/google/cloud/vmmigration/CMakeLists.txt
+++ b/google/cloud/vmmigration/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(vmmigration "VM Migration API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(vmmigration_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/vmmigration/mocks/mock_vm_migration_connection.h b/google/cloud/vmmigration/mocks/mock_vm_migration_connection.h
deleted file mode 100644
index d71987c34d2ff..0000000000000
--- a/google/cloud/vmmigration/mocks/mock_vm_migration_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vmmigration/v1/vmmigration.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_MOCKS_MOCK_VM_MIGRATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_MOCKS_MOCK_VM_MIGRATION_CONNECTION_H
-
-#include "google/cloud/vmmigration/v1/mocks/mock_vm_migration_connection.h"
-#include "google/cloud/vmmigration/vm_migration_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in vmmigration_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace vmmigration_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vmmigration_v1_mocks::MockVmMigrationConnection directly.
-using ::google::cloud::vmmigration_v1_mocks::MockVmMigrationConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vmmigration_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_MOCKS_MOCK_VM_MIGRATION_CONNECTION_H
diff --git a/google/cloud/vmmigration/vm_migration_client.h b/google/cloud/vmmigration/vm_migration_client.h
deleted file mode 100644
index 169558228c250..0000000000000
--- a/google/cloud/vmmigration/vm_migration_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vmmigration/v1/vmmigration.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_CLIENT_H
-
-#include "google/cloud/vmmigration/v1/vm_migration_client.h"
-#include "google/cloud/vmmigration/vm_migration_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in vmmigration_v1 instead of the aliases defined in
-///     this namespace.
-namespace vmmigration {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vmmigration_v1::VmMigrationClient directly.
-using ::google::cloud::vmmigration_v1::VmMigrationClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vmmigration
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_CLIENT_H
diff --git a/google/cloud/vmmigration/vm_migration_connection.h b/google/cloud/vmmigration/vm_migration_connection.h
deleted file mode 100644
index 17cbe7173345b..0000000000000
--- a/google/cloud/vmmigration/vm_migration_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vmmigration/v1/vmmigration.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_CONNECTION_H
-
-#include "google/cloud/vmmigration/v1/vm_migration_connection.h"
-#include "google/cloud/vmmigration/vm_migration_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace vmmigration {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vmmigration_v1::MakeVmMigrationConnection directly.
-using ::google::cloud::vmmigration_v1::MakeVmMigrationConnection;
-
-/// @deprecated Use vmmigration_v1::VmMigrationConnection directly.
-using ::google::cloud::vmmigration_v1::VmMigrationConnection;
-
-/// @deprecated Use vmmigration_v1::VmMigrationLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::vmmigration_v1::VmMigrationLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use vmmigration_v1::VmMigrationLimitedTimeRetryPolicy directly.
-using ::google::cloud::vmmigration_v1::VmMigrationLimitedTimeRetryPolicy;
-
-/// @deprecated Use vmmigration_v1::VmMigrationRetryPolicy directly.
-using ::google::cloud::vmmigration_v1::VmMigrationRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vmmigration
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_CONNECTION_H
diff --git a/google/cloud/vmmigration/vm_migration_connection_idempotency_policy.h b/google/cloud/vmmigration/vm_migration_connection_idempotency_policy.h
deleted file mode 100644
index 9cc1abda08f67..0000000000000
--- a/google/cloud/vmmigration/vm_migration_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vmmigration/v1/vmmigration.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/vmmigration/v1/vm_migration_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace vmmigration {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// vmmigration_v1::MakeDefaultVmMigrationConnectionIdempotencyPolicy directly.
-using ::google::cloud::vmmigration_v1::
-    MakeDefaultVmMigrationConnectionIdempotencyPolicy;
-
-/// @deprecated Use vmmigration_v1::VmMigrationConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::vmmigration_v1::VmMigrationConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vmmigration
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/vmmigration/vm_migration_options.h b/google/cloud/vmmigration/vm_migration_options.h
deleted file mode 100644
index 4e8682d508a61..0000000000000
--- a/google/cloud/vmmigration/vm_migration_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vmmigration/v1/vmmigration.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_OPTIONS_H
-
-#include "google/cloud/vmmigration/v1/vm_migration_options.h"
-#include "google/cloud/vmmigration/vm_migration_connection.h"
-#include "google/cloud/vmmigration/vm_migration_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace vmmigration {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vmmigration_v1::VmMigrationPollingPolicyOption directly.
-using ::google::cloud::vmmigration_v1::VmMigrationPollingPolicyOption;
-
-/// @deprecated Use vmmigration_v1::VmMigrationBackoffPolicyOption directly.
-using ::google::cloud::vmmigration_v1::VmMigrationBackoffPolicyOption;
-
-/// @deprecated Use vmmigration_v1::VmMigrationConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::vmmigration_v1::
-    VmMigrationConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use vmmigration_v1::VmMigrationPolicyOptionList directly.
-using ::google::cloud::vmmigration_v1::VmMigrationPolicyOptionList;
-
-/// @deprecated Use vmmigration_v1::VmMigrationRetryPolicyOption directly.
-using ::google::cloud::vmmigration_v1::VmMigrationRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vmmigration
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VMMIGRATION_VM_MIGRATION_OPTIONS_H
diff --git a/google/cloud/vpcaccess/BUILD.bazel b/google/cloud/vpcaccess/BUILD.bazel
index 8de07eb488011..bac4db252fb71 100644
--- a/google/cloud/vpcaccess/BUILD.bazel
+++ b/google/cloud/vpcaccess/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/vpcaccess/CMakeLists.txt b/google/cloud/vpcaccess/CMakeLists.txt
index af6b2c3febfb1..6b8bd903dcf34 100644
--- a/google/cloud/vpcaccess/CMakeLists.txt
+++ b/google/cloud/vpcaccess/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(vpcaccess "Serverless VPC Access API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(vpcaccess_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/vpcaccess/mocks/mock_vpc_access_connection.h b/google/cloud/vpcaccess/mocks/mock_vpc_access_connection.h
deleted file mode 100644
index 102de2a938155..0000000000000
--- a/google/cloud/vpcaccess/mocks/mock_vpc_access_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vpcaccess/v1/vpc_access.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_MOCKS_MOCK_VPC_ACCESS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_MOCKS_MOCK_VPC_ACCESS_CONNECTION_H
-
-#include "google/cloud/vpcaccess/v1/mocks/mock_vpc_access_connection.h"
-#include "google/cloud/vpcaccess/vpc_access_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in vpcaccess_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace vpcaccess_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vpcaccess_v1_mocks::MockVpcAccessServiceConnection directly.
-using ::google::cloud::vpcaccess_v1_mocks::MockVpcAccessServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vpcaccess_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_MOCKS_MOCK_VPC_ACCESS_CONNECTION_H
diff --git a/google/cloud/vpcaccess/vpc_access_client.h b/google/cloud/vpcaccess/vpc_access_client.h
deleted file mode 100644
index 5b38a9f5e67f6..0000000000000
--- a/google/cloud/vpcaccess/vpc_access_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vpcaccess/v1/vpc_access.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_CLIENT_H
-
-#include "google/cloud/vpcaccess/v1/vpc_access_client.h"
-#include "google/cloud/vpcaccess/vpc_access_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in vpcaccess_v1 instead of the aliases defined in
-///     this namespace.
-namespace vpcaccess {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServiceClient directly.
-using ::google::cloud::vpcaccess_v1::VpcAccessServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vpcaccess
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_CLIENT_H
diff --git a/google/cloud/vpcaccess/vpc_access_connection.h b/google/cloud/vpcaccess/vpc_access_connection.h
deleted file mode 100644
index 24a61273068ea..0000000000000
--- a/google/cloud/vpcaccess/vpc_access_connection.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vpcaccess/v1/vpc_access.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_CONNECTION_H
-
-#include "google/cloud/vpcaccess/v1/vpc_access_connection.h"
-#include "google/cloud/vpcaccess/vpc_access_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace vpcaccess {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vpcaccess_v1::MakeVpcAccessServiceConnection directly.
-using ::google::cloud::vpcaccess_v1::MakeVpcAccessServiceConnection;
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServiceConnection directly.
-using ::google::cloud::vpcaccess_v1::VpcAccessServiceConnection;
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::vpcaccess_v1::
-    VpcAccessServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServiceLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::vpcaccess_v1::VpcAccessServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServiceRetryPolicy directly.
-using ::google::cloud::vpcaccess_v1::VpcAccessServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vpcaccess
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_CONNECTION_H
diff --git a/google/cloud/vpcaccess/vpc_access_connection_idempotency_policy.h b/google/cloud/vpcaccess/vpc_access_connection_idempotency_policy.h
deleted file mode 100644
index b54d42c9e60df..0000000000000
--- a/google/cloud/vpcaccess/vpc_access_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vpcaccess/v1/vpc_access.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/vpcaccess/v1/vpc_access_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace vpcaccess {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// vpcaccess_v1::MakeDefaultVpcAccessServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::vpcaccess_v1::
-    MakeDefaultVpcAccessServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::vpcaccess_v1::
-    VpcAccessServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vpcaccess
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/vpcaccess/vpc_access_options.h b/google/cloud/vpcaccess/vpc_access_options.h
deleted file mode 100644
index 41a692c5fe56b..0000000000000
--- a/google/cloud/vpcaccess/vpc_access_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/vpcaccess/v1/vpc_access.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_OPTIONS_H
-
-#include "google/cloud/vpcaccess/v1/vpc_access_options.h"
-#include "google/cloud/vpcaccess/vpc_access_connection.h"
-#include "google/cloud/vpcaccess/vpc_access_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace vpcaccess {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServicePollingPolicyOption directly.
-using ::google::cloud::vpcaccess_v1::VpcAccessServicePollingPolicyOption;
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServiceBackoffPolicyOption directly.
-using ::google::cloud::vpcaccess_v1::VpcAccessServiceBackoffPolicyOption;
-
-/// @deprecated Use
-/// vpcaccess_v1::VpcAccessServiceConnectionIdempotencyPolicyOption directly.
-using ::google::cloud::vpcaccess_v1::
-    VpcAccessServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServicePolicyOptionList directly.
-using ::google::cloud::vpcaccess_v1::VpcAccessServicePolicyOptionList;
-
-/// @deprecated Use vpcaccess_v1::VpcAccessServiceRetryPolicyOption directly.
-using ::google::cloud::vpcaccess_v1::VpcAccessServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace vpcaccess
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_VPCACCESS_VPC_ACCESS_OPTIONS_H
diff --git a/google/cloud/webrisk/BUILD.bazel b/google/cloud/webrisk/BUILD.bazel
index 78bb9a3164fd3..9a0b29a58ef65 100644
--- a/google/cloud/webrisk/BUILD.bazel
+++ b/google/cloud/webrisk/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/webrisk/CMakeLists.txt b/google/cloud/webrisk/CMakeLists.txt
index a5b3a7c457940..d55b6cd19d2a1 100644
--- a/google/cloud/webrisk/CMakeLists.txt
+++ b/google/cloud/webrisk/CMakeLists.txt
@@ -28,8 +28,7 @@ endif ()
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(webrisk "Web Risk API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+google_cloud_cpp_add_gapic_library(webrisk "Web Risk API" SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(webrisk_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/webrisk/mocks/mock_web_risk_connection.h b/google/cloud/webrisk/mocks/mock_web_risk_connection.h
deleted file mode 100644
index d7e8f1d072537..0000000000000
--- a/google/cloud/webrisk/mocks/mock_web_risk_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/webrisk/v1/webrisk.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_MOCKS_MOCK_WEB_RISK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_MOCKS_MOCK_WEB_RISK_CONNECTION_H
-
-#include "google/cloud/webrisk/v1/mocks/mock_web_risk_connection.h"
-#include "google/cloud/webrisk/web_risk_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in webrisk_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace webrisk_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use webrisk_v1_mocks::MockWebRiskServiceConnection directly.
-using ::google::cloud::webrisk_v1_mocks::MockWebRiskServiceConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace webrisk_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_MOCKS_MOCK_WEB_RISK_CONNECTION_H
diff --git a/google/cloud/webrisk/web_risk_client.h b/google/cloud/webrisk/web_risk_client.h
deleted file mode 100644
index 93834d5a4f726..0000000000000
--- a/google/cloud/webrisk/web_risk_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/webrisk/v1/webrisk.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_CLIENT_H
-
-#include "google/cloud/webrisk/v1/web_risk_client.h"
-#include "google/cloud/webrisk/web_risk_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in webrisk_v1 instead of the aliases defined in
-///     this namespace.
-namespace webrisk {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use webrisk_v1::WebRiskServiceClient directly.
-using ::google::cloud::webrisk_v1::WebRiskServiceClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace webrisk
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_CLIENT_H
diff --git a/google/cloud/webrisk/web_risk_connection.h b/google/cloud/webrisk/web_risk_connection.h
deleted file mode 100644
index e7fa8f8096ba3..0000000000000
--- a/google/cloud/webrisk/web_risk_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/webrisk/v1/webrisk.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_CONNECTION_H
-
-#include "google/cloud/webrisk/v1/web_risk_connection.h"
-#include "google/cloud/webrisk/web_risk_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace webrisk {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use webrisk_v1::MakeWebRiskServiceConnection directly.
-using ::google::cloud::webrisk_v1::MakeWebRiskServiceConnection;
-
-/// @deprecated Use webrisk_v1::WebRiskServiceConnection directly.
-using ::google::cloud::webrisk_v1::WebRiskServiceConnection;
-
-/// @deprecated Use webrisk_v1::WebRiskServiceLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::webrisk_v1::WebRiskServiceLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use webrisk_v1::WebRiskServiceLimitedTimeRetryPolicy directly.
-using ::google::cloud::webrisk_v1::WebRiskServiceLimitedTimeRetryPolicy;
-
-/// @deprecated Use webrisk_v1::WebRiskServiceRetryPolicy directly.
-using ::google::cloud::webrisk_v1::WebRiskServiceRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace webrisk
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_CONNECTION_H
diff --git a/google/cloud/webrisk/web_risk_connection_idempotency_policy.h b/google/cloud/webrisk/web_risk_connection_idempotency_policy.h
deleted file mode 100644
index 8332ce46ffb93..0000000000000
--- a/google/cloud/webrisk/web_risk_connection_idempotency_policy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/webrisk/v1/webrisk.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/webrisk/v1/web_risk_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace webrisk {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// webrisk_v1::MakeDefaultWebRiskServiceConnectionIdempotencyPolicy directly.
-using ::google::cloud::webrisk_v1::
-    MakeDefaultWebRiskServiceConnectionIdempotencyPolicy;
-
-/// @deprecated Use webrisk_v1::WebRiskServiceConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::webrisk_v1::WebRiskServiceConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace webrisk
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/webrisk/web_risk_options.h b/google/cloud/webrisk/web_risk_options.h
deleted file mode 100644
index 0fb940e89b5d1..0000000000000
--- a/google/cloud/webrisk/web_risk_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/webrisk/v1/webrisk.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_OPTIONS_H
-
-#include "google/cloud/webrisk/v1/web_risk_options.h"
-#include "google/cloud/webrisk/web_risk_connection.h"
-#include "google/cloud/webrisk/web_risk_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace webrisk {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use webrisk_v1::WebRiskServicePollingPolicyOption directly.
-using ::google::cloud::webrisk_v1::WebRiskServicePollingPolicyOption;
-
-/// @deprecated Use webrisk_v1::WebRiskServiceBackoffPolicyOption directly.
-using ::google::cloud::webrisk_v1::WebRiskServiceBackoffPolicyOption;
-
-/// @deprecated Use webrisk_v1::WebRiskServiceConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::webrisk_v1::
-    WebRiskServiceConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use webrisk_v1::WebRiskServicePolicyOptionList directly.
-using ::google::cloud::webrisk_v1::WebRiskServicePolicyOptionList;
-
-/// @deprecated Use webrisk_v1::WebRiskServiceRetryPolicyOption directly.
-using ::google::cloud::webrisk_v1::WebRiskServiceRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace webrisk
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBRISK_WEB_RISK_OPTIONS_H
diff --git a/google/cloud/websecurityscanner/BUILD.bazel b/google/cloud/websecurityscanner/BUILD.bazel
index 6574a2f9db903..aca53be177c96 100644
--- a/google/cloud/websecurityscanner/BUILD.bazel
+++ b/google/cloud/websecurityscanner/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "v1/",
 ]
 
diff --git a/google/cloud/websecurityscanner/CMakeLists.txt b/google/cloud/websecurityscanner/CMakeLists.txt
index 2fa4745affc52..d77d7360215e5 100644
--- a/google/cloud/websecurityscanner/CMakeLists.txt
+++ b/google/cloud/websecurityscanner/CMakeLists.txt
@@ -17,7 +17,7 @@
 include(GoogleCloudCppLibrary)
 
 google_cloud_cpp_add_gapic_library(websecurityscanner "Web Security Scanner API"
-                                   SERVICE_DIRS "__EMPTY__" "v1/")
+                                   SERVICE_DIRS "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(websecurityscanner_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/websecurityscanner/mocks/mock_web_security_scanner_connection.h b/google/cloud/websecurityscanner/mocks/mock_web_security_scanner_connection.h
deleted file mode 100644
index b57aa12ee8bf5..0000000000000
--- a/google/cloud/websecurityscanner/mocks/mock_web_security_scanner_connection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/websecurityscanner/v1/web_security_scanner.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_MOCKS_MOCK_WEB_SECURITY_SCANNER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_MOCKS_MOCK_WEB_SECURITY_SCANNER_CONNECTION_H
-
-#include "google/cloud/websecurityscanner/v1/mocks/mock_web_security_scanner_connection.h"
-#include "google/cloud/websecurityscanner/web_security_scanner_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in websecurityscanner_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace websecurityscanner_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// websecurityscanner_v1_mocks::MockWebSecurityScannerConnection directly.
-using ::google::cloud::websecurityscanner_v1_mocks::
-    MockWebSecurityScannerConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace websecurityscanner_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_MOCKS_MOCK_WEB_SECURITY_SCANNER_CONNECTION_H
diff --git a/google/cloud/websecurityscanner/web_security_scanner_client.h b/google/cloud/websecurityscanner/web_security_scanner_client.h
deleted file mode 100644
index 0dd470dbec498..0000000000000
--- a/google/cloud/websecurityscanner/web_security_scanner_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/websecurityscanner/v1/web_security_scanner.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_CLIENT_H
-
-#include "google/cloud/websecurityscanner/v1/web_security_scanner_client.h"
-#include "google/cloud/websecurityscanner/web_security_scanner_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in websecurityscanner_v1 instead of the aliases defined in
-///     this namespace.
-namespace websecurityscanner {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use websecurityscanner_v1::WebSecurityScannerClient directly.
-using ::google::cloud::websecurityscanner_v1::WebSecurityScannerClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace websecurityscanner
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_CLIENT_H
diff --git a/google/cloud/websecurityscanner/web_security_scanner_connection.h b/google/cloud/websecurityscanner/web_security_scanner_connection.h
deleted file mode 100644
index 3a8185922028f..0000000000000
--- a/google/cloud/websecurityscanner/web_security_scanner_connection.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/websecurityscanner/v1/web_security_scanner.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_CONNECTION_H
-
-#include "google/cloud/websecurityscanner/v1/web_security_scanner_connection.h"
-#include "google/cloud/websecurityscanner/web_security_scanner_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace websecurityscanner {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use websecurityscanner_v1::MakeWebSecurityScannerConnection
-/// directly.
-using ::google::cloud::websecurityscanner_v1::MakeWebSecurityScannerConnection;
-
-/// @deprecated Use websecurityscanner_v1::WebSecurityScannerConnection
-/// directly.
-using ::google::cloud::websecurityscanner_v1::WebSecurityScannerConnection;
-
-/// @deprecated Use
-/// websecurityscanner_v1::WebSecurityScannerLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::websecurityscanner_v1::
-    WebSecurityScannerLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use
-/// websecurityscanner_v1::WebSecurityScannerLimitedTimeRetryPolicy directly.
-using ::google::cloud::websecurityscanner_v1::
-    WebSecurityScannerLimitedTimeRetryPolicy;
-
-/// @deprecated Use websecurityscanner_v1::WebSecurityScannerRetryPolicy
-/// directly.
-using ::google::cloud::websecurityscanner_v1::WebSecurityScannerRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace websecurityscanner
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_CONNECTION_H
diff --git a/google/cloud/websecurityscanner/web_security_scanner_connection_idempotency_policy.h b/google/cloud/websecurityscanner/web_security_scanner_connection_idempotency_policy.h
deleted file mode 100644
index af60871e040cf..0000000000000
--- a/google/cloud/websecurityscanner/web_security_scanner_connection_idempotency_policy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/websecurityscanner/v1/web_security_scanner.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/websecurityscanner/v1/web_security_scanner_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace websecurityscanner {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// websecurityscanner_v1::MakeDefaultWebSecurityScannerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::websecurityscanner_v1::
-    MakeDefaultWebSecurityScannerConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// websecurityscanner_v1::WebSecurityScannerConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::websecurityscanner_v1::
-    WebSecurityScannerConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace websecurityscanner
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/websecurityscanner/web_security_scanner_options.h b/google/cloud/websecurityscanner/web_security_scanner_options.h
deleted file mode 100644
index 85aba80e7885e..0000000000000
--- a/google/cloud/websecurityscanner/web_security_scanner_options.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/websecurityscanner/v1/web_security_scanner.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_OPTIONS_H
-
-#include "google/cloud/websecurityscanner/v1/web_security_scanner_options.h"
-#include "google/cloud/websecurityscanner/web_security_scanner_connection.h"
-#include "google/cloud/websecurityscanner/web_security_scanner_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace websecurityscanner {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use websecurityscanner_v1::WebSecurityScannerBackoffPolicyOption
-/// directly.
-using ::google::cloud::websecurityscanner_v1::
-    WebSecurityScannerBackoffPolicyOption;
-
-/// @deprecated Use
-/// websecurityscanner_v1::WebSecurityScannerConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::websecurityscanner_v1::
-    WebSecurityScannerConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use websecurityscanner_v1::WebSecurityScannerPolicyOptionList
-/// directly.
-using ::google::cloud::websecurityscanner_v1::
-    WebSecurityScannerPolicyOptionList;
-
-/// @deprecated Use websecurityscanner_v1::WebSecurityScannerRetryPolicyOption
-/// directly.
-using ::google::cloud::websecurityscanner_v1::
-    WebSecurityScannerRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace websecurityscanner
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WEBSECURITYSCANNER_WEB_SECURITY_SCANNER_OPTIONS_H
diff --git a/google/cloud/workflows/BUILD.bazel b/google/cloud/workflows/BUILD.bazel
index fa5eeb41e48cd..3ef8d4c01f5a9 100644
--- a/google/cloud/workflows/BUILD.bazel
+++ b/google/cloud/workflows/BUILD.bazel
@@ -19,7 +19,6 @@ package(default_visibility = ["//visibility:private"])
 licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
-    "",
     "executions/v1/",
     "v1/",
 ]
diff --git a/google/cloud/workflows/CMakeLists.txt b/google/cloud/workflows/CMakeLists.txt
index 8aa37f4c1c9bb..4bd6a8242ea03 100644
--- a/google/cloud/workflows/CMakeLists.txt
+++ b/google/cloud/workflows/CMakeLists.txt
@@ -16,9 +16,8 @@
 
 include(GoogleCloudCppLibrary)
 
-google_cloud_cpp_add_gapic_library(
-    workflows "Workflow Executions API" SERVICE_DIRS "__EMPTY__"
-                                                     "executions/v1/" "v1/")
+google_cloud_cpp_add_gapic_library(workflows "Workflow Executions API"
+                                   SERVICE_DIRS "executions/v1/" "v1/")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(workflows_quickstart "quickstart/quickstart.cc")
diff --git a/google/cloud/workflows/executions_client.h b/google/cloud/workflows/executions_client.h
deleted file mode 100644
index bcb44336918a7..0000000000000
--- a/google/cloud/workflows/executions_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/executions/v1/executions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_CLIENT_H
-
-#include "google/cloud/workflows/executions/v1/executions_client.h"
-#include "google/cloud/workflows/executions_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in workflows_executions_v1 instead of the aliases defined
-///     in this namespace.
-namespace workflows {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use workflows_executions_v1::ExecutionsClient directly.
-using ::google::cloud::workflows_executions_v1::ExecutionsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_CLIENT_H
diff --git a/google/cloud/workflows/executions_connection.h b/google/cloud/workflows/executions_connection.h
deleted file mode 100644
index af08d6515e0a2..0000000000000
--- a/google/cloud/workflows/executions_connection.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/executions/v1/executions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_CONNECTION_H
-
-#include "google/cloud/workflows/executions/v1/executions_connection.h"
-#include "google/cloud/workflows/executions_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace workflows {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use workflows_executions_v1::MakeExecutionsConnection directly.
-using ::google::cloud::workflows_executions_v1::MakeExecutionsConnection;
-
-/// @deprecated Use workflows_executions_v1::ExecutionsConnection directly.
-using ::google::cloud::workflows_executions_v1::ExecutionsConnection;
-
-/// @deprecated Use
-/// workflows_executions_v1::ExecutionsLimitedErrorCountRetryPolicy directly.
-using ::google::cloud::workflows_executions_v1::
-    ExecutionsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use workflows_executions_v1::ExecutionsLimitedTimeRetryPolicy
-/// directly.
-using ::google::cloud::workflows_executions_v1::
-    ExecutionsLimitedTimeRetryPolicy;
-
-/// @deprecated Use workflows_executions_v1::ExecutionsRetryPolicy directly.
-using ::google::cloud::workflows_executions_v1::ExecutionsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_CONNECTION_H
diff --git a/google/cloud/workflows/executions_connection_idempotency_policy.h b/google/cloud/workflows/executions_connection_idempotency_policy.h
deleted file mode 100644
index 038aa751c8e29..0000000000000
--- a/google/cloud/workflows/executions_connection_idempotency_policy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/executions/v1/executions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/workflows/executions/v1/executions_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace workflows {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// workflows_executions_v1::MakeDefaultExecutionsConnectionIdempotencyPolicy
-/// directly.
-using ::google::cloud::workflows_executions_v1::
-    MakeDefaultExecutionsConnectionIdempotencyPolicy;
-
-/// @deprecated Use
-/// workflows_executions_v1::ExecutionsConnectionIdempotencyPolicy directly.
-using ::google::cloud::workflows_executions_v1::
-    ExecutionsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/workflows/executions_options.h b/google/cloud/workflows/executions_options.h
deleted file mode 100644
index e49ebff4ded05..0000000000000
--- a/google/cloud/workflows/executions_options.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/executions/v1/executions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_OPTIONS_H
-
-#include "google/cloud/workflows/executions/v1/executions_options.h"
-#include "google/cloud/workflows/executions_connection.h"
-#include "google/cloud/workflows/executions_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace workflows {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use workflows_executions_v1::ExecutionsBackoffPolicyOption
-/// directly.
-using ::google::cloud::workflows_executions_v1::ExecutionsBackoffPolicyOption;
-
-/// @deprecated Use
-/// workflows_executions_v1::ExecutionsConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::workflows_executions_v1::
-    ExecutionsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use workflows_executions_v1::ExecutionsPolicyOptionList
-/// directly.
-using ::google::cloud::workflows_executions_v1::ExecutionsPolicyOptionList;
-
-/// @deprecated Use workflows_executions_v1::ExecutionsRetryPolicyOption
-/// directly.
-using ::google::cloud::workflows_executions_v1::ExecutionsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_EXECUTIONS_OPTIONS_H
diff --git a/google/cloud/workflows/mocks/mock_executions_connection.h b/google/cloud/workflows/mocks/mock_executions_connection.h
deleted file mode 100644
index b8f701a60acf8..0000000000000
--- a/google/cloud/workflows/mocks/mock_executions_connection.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/executions/v1/executions.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_MOCKS_MOCK_EXECUTIONS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_MOCKS_MOCK_EXECUTIONS_CONNECTION_H
-
-#include "google/cloud/workflows/executions/v1/mocks/mock_executions_connection.h"
-#include "google/cloud/workflows/executions_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in workflows_executions_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace workflows_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use workflows_executions_v1_mocks::MockExecutionsConnection
-/// directly.
-using ::google::cloud::workflows_executions_v1_mocks::MockExecutionsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_MOCKS_MOCK_EXECUTIONS_CONNECTION_H
diff --git a/google/cloud/workflows/mocks/mock_workflows_connection.h b/google/cloud/workflows/mocks/mock_workflows_connection.h
deleted file mode 100644
index d6a24aeed5642..0000000000000
--- a/google/cloud/workflows/mocks/mock_workflows_connection.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/v1/workflows.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_MOCKS_MOCK_WORKFLOWS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_MOCKS_MOCK_WORKFLOWS_CONNECTION_H
-
-#include "google/cloud/workflows/v1/mocks/mock_workflows_connection.h"
-#include "google/cloud/workflows/workflows_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in workflows_v1_mocks instead of the aliases
-///     defined in this namespace.
-namespace workflows_mocks {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use workflows_v1_mocks::MockWorkflowsConnection directly.
-using ::google::cloud::workflows_v1_mocks::MockWorkflowsConnection;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows_mocks
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_MOCKS_MOCK_WORKFLOWS_CONNECTION_H
diff --git a/google/cloud/workflows/workflows_client.h b/google/cloud/workflows/workflows_client.h
deleted file mode 100644
index 0abe1d7d1900c..0000000000000
--- a/google/cloud/workflows/workflows_client.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/v1/workflows.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_CLIENT_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_CLIENT_H
-
-#include "google/cloud/workflows/v1/workflows_client.h"
-#include "google/cloud/workflows/workflows_connection.h"
-
-namespace google {
-namespace cloud {
-/// @deprecated This namespace exists for backwards compatibility. Use the
-///     types defined in workflows_v1 instead of the aliases defined in
-///     this namespace.
-namespace workflows {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use workflows_v1::WorkflowsClient directly.
-using ::google::cloud::workflows_v1::WorkflowsClient;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_CLIENT_H
diff --git a/google/cloud/workflows/workflows_connection.h b/google/cloud/workflows/workflows_connection.h
deleted file mode 100644
index a546d50c070fd..0000000000000
--- a/google/cloud/workflows/workflows_connection.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/v1/workflows.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_CONNECTION_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_CONNECTION_H
-
-#include "google/cloud/workflows/v1/workflows_connection.h"
-#include "google/cloud/workflows/workflows_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace workflows {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use workflows_v1::MakeWorkflowsConnection directly.
-using ::google::cloud::workflows_v1::MakeWorkflowsConnection;
-
-/// @deprecated Use workflows_v1::WorkflowsConnection directly.
-using ::google::cloud::workflows_v1::WorkflowsConnection;
-
-/// @deprecated Use workflows_v1::WorkflowsLimitedErrorCountRetryPolicy
-/// directly.
-using ::google::cloud::workflows_v1::WorkflowsLimitedErrorCountRetryPolicy;
-
-/// @deprecated Use workflows_v1::WorkflowsLimitedTimeRetryPolicy directly.
-using ::google::cloud::workflows_v1::WorkflowsLimitedTimeRetryPolicy;
-
-/// @deprecated Use workflows_v1::WorkflowsRetryPolicy directly.
-using ::google::cloud::workflows_v1::WorkflowsRetryPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_CONNECTION_H
diff --git a/google/cloud/workflows/workflows_connection_idempotency_policy.h b/google/cloud/workflows/workflows_connection_idempotency_policy.h
deleted file mode 100644
index f6ad276822c14..0000000000000
--- a/google/cloud/workflows/workflows_connection_idempotency_policy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/v1/workflows.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_CONNECTION_IDEMPOTENCY_POLICY_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_CONNECTION_IDEMPOTENCY_POLICY_H
-
-#include "google/cloud/workflows/v1/workflows_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace workflows {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use
-/// workflows_v1::MakeDefaultWorkflowsConnectionIdempotencyPolicy directly.
-using ::google::cloud::workflows_v1::
-    MakeDefaultWorkflowsConnectionIdempotencyPolicy;
-
-/// @deprecated Use workflows_v1::WorkflowsConnectionIdempotencyPolicy directly.
-using ::google::cloud::workflows_v1::WorkflowsConnectionIdempotencyPolicy;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/workflows/workflows_options.h b/google/cloud/workflows/workflows_options.h
deleted file mode 100644
index 3e5267b502b97..0000000000000
--- a/google/cloud/workflows/workflows_options.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Generated by the Codegen C++ plugin.
-// If you make any local changes, they will be lost.
-// source: google/cloud/workflows/v1/workflows.proto
-
-#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_OPTIONS_H
-#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_OPTIONS_H
-
-#include "google/cloud/workflows/v1/workflows_options.h"
-#include "google/cloud/workflows/workflows_connection.h"
-#include "google/cloud/workflows/workflows_connection_idempotency_policy.h"
-
-namespace google {
-namespace cloud {
-namespace workflows {
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
-
-/// @deprecated Use workflows_v1::WorkflowsPollingPolicyOption directly.
-using ::google::cloud::workflows_v1::WorkflowsPollingPolicyOption;
-
-/// @deprecated Use workflows_v1::WorkflowsBackoffPolicyOption directly.
-using ::google::cloud::workflows_v1::WorkflowsBackoffPolicyOption;
-
-/// @deprecated Use workflows_v1::WorkflowsConnectionIdempotencyPolicyOption
-/// directly.
-using ::google::cloud::workflows_v1::WorkflowsConnectionIdempotencyPolicyOption;
-
-/// @deprecated Use workflows_v1::WorkflowsPolicyOptionList directly.
-using ::google::cloud::workflows_v1::WorkflowsPolicyOptionList;
-
-/// @deprecated Use workflows_v1::WorkflowsRetryPolicyOption directly.
-using ::google::cloud::workflows_v1::WorkflowsRetryPolicyOption;
-
-GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace workflows
-}  // namespace cloud
-}  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_WORKFLOWS_WORKFLOWS_OPTIONS_H