diff --git a/.changelog/4123.txt b/.changelog/4123.txt
new file mode 100644
index 0000000000..5365bdfac8
--- /dev/null
+++ b/.changelog/4123.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+provider: fixed an issue where the request headers would grow proportionally to the number of resources in a given `terraform apply`
+```
diff --git a/google-beta/provider_test.go b/google-beta/provider_test.go
index e0e420bf8b..b00a96c2b7 100644
--- a/google-beta/provider_test.go
+++ b/google-beta/provider_test.go
@@ -497,7 +497,6 @@ func TestAccProviderMeta_setModuleName(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProviderMeta_setModuleName(moduleName, randString(t, 10)),
-				Check:  testAccCheckConfigAgentModified(t, moduleName),
 			},
 			{
 				ResourceName:      "google_compute_address.default",
@@ -508,16 +507,6 @@ func TestAccProviderMeta_setModuleName(t *testing.T) {
 	})
 }
 
-func testAccCheckConfigAgentModified(t *testing.T, moduleName string) func(s *terraform.State) error {
-	return func(s *terraform.State) error {
-		config := googleProviderConfig(t)
-		if !strings.Contains(config.userAgent, moduleName) {
-			return fmt.Errorf("expected userAgent to contain provider_meta set module_name")
-		}
-		return nil
-	}
-}
-
 func TestAccProviderUserProjectOverride(t *testing.T) {
 	// Parallel fine-grained resource creation
 	skipIfVcr(t)
diff --git a/google-beta/resource_access_approval_folder_settings.go b/google-beta/resource_access_approval_folder_settings.go
index 0f8fdfc3d2..3b51fd6ee3 100644
--- a/google-beta/resource_access_approval_folder_settings.go
+++ b/google-beta/resource_access_approval_folder_settings.go
@@ -269,7 +269,6 @@ func resourceAccessApprovalFolderSettingsUpdate(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -331,7 +330,6 @@ func resourceAccessApprovalFolderSettingsDelete(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["notificationEmails"] = []string{}
diff --git a/google-beta/resource_access_approval_organization_settings.go b/google-beta/resource_access_approval_organization_settings.go
index 7b16b3e235..45e61a3f41 100644
--- a/google-beta/resource_access_approval_organization_settings.go
+++ b/google-beta/resource_access_approval_organization_settings.go
@@ -231,7 +231,6 @@ func resourceAccessApprovalOrganizationSettingsUpdate(d *schema.ResourceData, me
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -293,7 +292,6 @@ func resourceAccessApprovalOrganizationSettingsDelete(d *schema.ResourceData, me
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["notificationEmails"] = []string{}
diff --git a/google-beta/resource_access_approval_project_settings.go b/google-beta/resource_access_approval_project_settings.go
index 6a3a216f00..3075941522 100644
--- a/google-beta/resource_access_approval_project_settings.go
+++ b/google-beta/resource_access_approval_project_settings.go
@@ -253,7 +253,6 @@ func resourceAccessApprovalProjectSettingsUpdate(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -321,7 +320,6 @@ func resourceAccessApprovalProjectSettingsDelete(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["notificationEmails"] = []string{}
diff --git a/google-beta/resource_access_context_manager_access_level.go b/google-beta/resource_access_context_manager_access_level.go
index 7b3029da1b..dcce597048 100644
--- a/google-beta/resource_access_context_manager_access_level.go
+++ b/google-beta/resource_access_context_manager_access_level.go
@@ -432,7 +432,6 @@ func resourceAccessContextManagerAccessLevelUpdate(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -527,7 +526,6 @@ func resourceAccessContextManagerAccessLevelDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_access_context_manager_access_level_condition.go b/google-beta/resource_access_context_manager_access_level_condition.go
index 7c9af3e7bf..1d65fe3593 100644
--- a/google-beta/resource_access_context_manager_access_level_condition.go
+++ b/google-beta/resource_access_context_manager_access_level_condition.go
@@ -396,7 +396,6 @@ func resourceAccessContextManagerAccessLevelConditionDelete(d *schema.ResourceDa
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_access_context_manager_access_levels.go b/google-beta/resource_access_context_manager_access_levels.go
index e6dc13afef..f490650fed 100644
--- a/google-beta/resource_access_context_manager_access_levels.go
+++ b/google-beta/resource_access_context_manager_access_levels.go
@@ -383,7 +383,6 @@ func resourceAccessContextManagerAccessLevelsUpdate(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -432,7 +431,6 @@ func resourceAccessContextManagerAccessLevelsDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["accessLevels"] = []string{}
diff --git a/google-beta/resource_access_context_manager_access_policy.go b/google-beta/resource_access_context_manager_access_policy.go
index 68d463d67e..459dded975 100644
--- a/google-beta/resource_access_context_manager_access_policy.go
+++ b/google-beta/resource_access_context_manager_access_policy.go
@@ -208,7 +208,6 @@ func resourceAccessContextManagerAccessPolicyUpdate(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -268,7 +267,6 @@ func resourceAccessContextManagerAccessPolicyDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_access_context_manager_service_perimeter.go b/google-beta/resource_access_context_manager_service_perimeter.go
index 4a617b00c2..250f030924 100644
--- a/google-beta/resource_access_context_manager_service_perimeter.go
+++ b/google-beta/resource_access_context_manager_service_perimeter.go
@@ -465,7 +465,6 @@ func resourceAccessContextManagerServicePerimeterUpdate(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -577,7 +576,6 @@ func resourceAccessContextManagerServicePerimeterDelete(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_access_context_manager_service_perimeter_resource.go b/google-beta/resource_access_context_manager_service_perimeter_resource.go
index 1d26910101..aedbc723c4 100644
--- a/google-beta/resource_access_context_manager_service_perimeter_resource.go
+++ b/google-beta/resource_access_context_manager_service_perimeter_resource.go
@@ -202,7 +202,6 @@ func resourceAccessContextManagerServicePerimeterResourceDelete(d *schema.Resour
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_access_context_manager_service_perimeters.go b/google-beta/resource_access_context_manager_service_perimeters.go
index 5b8d57a8c4..3066141c38 100644
--- a/google-beta/resource_access_context_manager_service_perimeters.go
+++ b/google-beta/resource_access_context_manager_service_perimeters.go
@@ -387,7 +387,6 @@ func resourceAccessContextManagerServicePerimetersUpdate(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -442,7 +441,6 @@ func resourceAccessContextManagerServicePerimetersDelete(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["servicePerimeters"] = []string{}
diff --git a/google-beta/resource_active_directory_domain.go b/google-beta/resource_active_directory_domain.go
index b4af292725..66fefbac1e 100644
--- a/google-beta/resource_active_directory_domain.go
+++ b/google-beta/resource_active_directory_domain.go
@@ -274,7 +274,6 @@ func resourceActiveDirectoryDomainUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -360,7 +359,6 @@ func resourceActiveDirectoryDomainDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_active_directory_domain_trust.go b/google-beta/resource_active_directory_domain_trust.go
index 9055d17745..0112a67c4f 100644
--- a/google-beta/resource_active_directory_domain_trust.go
+++ b/google-beta/resource_active_directory_domain_trust.go
@@ -310,7 +310,6 @@ func resourceActiveDirectoryDomainTrustUpdate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -400,7 +399,6 @@ func resourceActiveDirectoryDomainTrustDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	project, err := getProject(d, config)
 	if err != nil {
diff --git a/google-beta/resource_app_engine_application_url_dispatch_rules.go b/google-beta/resource_app_engine_application_url_dispatch_rules.go
index 4270ef90d7..102560ffad 100644
--- a/google-beta/resource_app_engine_application_url_dispatch_rules.go
+++ b/google-beta/resource_app_engine_application_url_dispatch_rules.go
@@ -194,7 +194,6 @@ func resourceAppEngineApplicationUrlDispatchRulesUpdate(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -256,7 +255,6 @@ func resourceAppEngineApplicationUrlDispatchRulesDelete(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_app_engine_domain_mapping.go b/google-beta/resource_app_engine_domain_mapping.go
index 952f36e569..618c8fc68c 100644
--- a/google-beta/resource_app_engine_domain_mapping.go
+++ b/google-beta/resource_app_engine_domain_mapping.go
@@ -293,7 +293,6 @@ func resourceAppEngineDomainMappingUpdate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -367,7 +366,6 @@ func resourceAppEngineDomainMappingDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_app_engine_firewall_rule.go b/google-beta/resource_app_engine_firewall_rule.go
index 76819ffc47..cf950e6184 100644
--- a/google-beta/resource_app_engine_firewall_rule.go
+++ b/google-beta/resource_app_engine_firewall_rule.go
@@ -252,7 +252,6 @@ func resourceAppEngineFirewallRuleUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -347,7 +346,6 @@ func resourceAppEngineFirewallRuleDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_app_engine_flexible_app_version.go b/google-beta/resource_app_engine_flexible_app_version.go
index 2ed8b91240..28e88472d6 100644
--- a/google-beta/resource_app_engine_flexible_app_version.go
+++ b/google-beta/resource_app_engine_flexible_app_version.go
@@ -1184,7 +1184,6 @@ func resourceAppEngineFlexibleAppVersionUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -1389,7 +1388,6 @@ func resourceAppEngineFlexibleAppVersionDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	if d.Get("noop_on_destroy") == true {
 		log.Printf("[DEBUG] Keeping the AppVersion %q", d.Id())
diff --git a/google-beta/resource_app_engine_service_split_traffic.go b/google-beta/resource_app_engine_service_split_traffic.go
index ef58b50ca5..c35b7090fb 100644
--- a/google-beta/resource_app_engine_service_split_traffic.go
+++ b/google-beta/resource_app_engine_service_split_traffic.go
@@ -206,7 +206,6 @@ func resourceAppEngineServiceSplitTrafficUpdate(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -284,13 +283,6 @@ func resourceAppEngineServiceSplitTrafficUpdate(d *schema.ResourceData, meta int
 }
 
 func resourceAppEngineServiceSplitTrafficDelete(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*Config)
-	userAgent, err := generateUserAgentString(d, config.userAgent)
-	if err != nil {
-		return err
-	}
-	config.userAgent = userAgent
-
 	log.Printf("[WARNING] AppEngine ServiceSplitTraffic resources"+
 		" cannot be deleted from GCP. The resource %s will be removed from Terraform"+
 		" state, but will still be present on the server.", d.Id())
diff --git a/google-beta/resource_app_engine_service_split_traffic_generated_test.go b/google-beta/resource_app_engine_service_split_traffic_generated_test.go
index 28e78e5f3c..3cbb0bf8f2 100644
--- a/google-beta/resource_app_engine_service_split_traffic_generated_test.go
+++ b/google-beta/resource_app_engine_service_split_traffic_generated_test.go
@@ -15,12 +15,9 @@
 package google
 
 import (
-	"log"
-	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
 func TestAccAppEngineServiceSplitTraffic_appEngineServiceSplitTrafficExample(t *testing.T) {
@@ -37,7 +34,6 @@ func TestAccAppEngineServiceSplitTraffic_appEngineServiceSplitTrafficExample(t *
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 		},
-		CheckDestroy: testAccCheckAppEngineServiceSplitTrafficDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAppEngineServiceSplitTraffic_appEngineServiceSplitTrafficExample(context),
@@ -116,20 +112,3 @@ resource "google_app_engine_service_split_traffic" "liveapp" {
 }
 `, context)
 }
-
-func testAccCheckAppEngineServiceSplitTrafficDestroyProducer(t *testing.T) func(s *terraform.State) error {
-	return func(s *terraform.State) error {
-		for name, rs := range s.RootModule().Resources {
-			if rs.Type != "google_app_engine_service_split_traffic" {
-				continue
-			}
-			if strings.HasPrefix(name, "data.") {
-				continue
-			}
-
-			log.Printf("[DEBUG] Ignoring destroy during test")
-		}
-
-		return nil
-	}
-}
diff --git a/google-beta/resource_app_engine_standard_app_version.go b/google-beta/resource_app_engine_standard_app_version.go
index 3bd45e2e0e..8b914ac00c 100644
--- a/google-beta/resource_app_engine_standard_app_version.go
+++ b/google-beta/resource_app_engine_standard_app_version.go
@@ -689,7 +689,6 @@ func resourceAppEngineStandardAppVersionUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -835,7 +834,6 @@ func resourceAppEngineStandardAppVersionDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	if d.Get("noop_on_destroy") == true {
 		log.Printf("[DEBUG] Keeping the AppVersion %q", d.Id())
diff --git a/google-beta/resource_artifact_registry_repository.go b/google-beta/resource_artifact_registry_repository.go
index 2cf0068234..3a5934c396 100644
--- a/google-beta/resource_artifact_registry_repository.go
+++ b/google-beta/resource_artifact_registry_repository.go
@@ -270,7 +270,6 @@ func resourceArtifactRegistryRepositoryUpdate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -343,7 +342,6 @@ func resourceArtifactRegistryRepositoryDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_big_query_dataset.go b/google-beta/resource_big_query_dataset.go
index b07ab8159f..2f08122afb 100644
--- a/google-beta/resource_big_query_dataset.go
+++ b/google-beta/resource_big_query_dataset.go
@@ -495,7 +495,6 @@ func resourceBigQueryDatasetUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -590,7 +589,6 @@ func resourceBigQueryDatasetDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_big_query_dataset_access.go b/google-beta/resource_big_query_dataset_access.go
index 63d7003d80..dcfdc9511e 100644
--- a/google-beta/resource_big_query_dataset_access.go
+++ b/google-beta/resource_big_query_dataset_access.go
@@ -488,7 +488,6 @@ func resourceBigQueryDatasetAccessDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_bigquery_connection_connection.go b/google-beta/resource_bigquery_connection_connection.go
index 55533790d1..6f9ad656ee 100644
--- a/google-beta/resource_bigquery_connection_connection.go
+++ b/google-beta/resource_bigquery_connection_connection.go
@@ -262,7 +262,6 @@ func resourceBigqueryConnectionConnectionUpdate(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -340,7 +339,6 @@ func resourceBigqueryConnectionConnectionDelete(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_bigquery_data_transfer_config.go b/google-beta/resource_bigquery_data_transfer_config.go
index 48735e0e40..900165ef02 100644
--- a/google-beta/resource_bigquery_data_transfer_config.go
+++ b/google-beta/resource_bigquery_data_transfer_config.go
@@ -373,7 +373,6 @@ func resourceBigqueryDataTransferConfigUpdate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -486,7 +485,6 @@ func resourceBigqueryDataTransferConfigDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_bigquery_reservation_reservation.go b/google-beta/resource_bigquery_reservation_reservation.go
index 0573de239b..56ec029b1c 100644
--- a/google-beta/resource_bigquery_reservation_reservation.go
+++ b/google-beta/resource_bigquery_reservation_reservation.go
@@ -188,7 +188,6 @@ func resourceBigqueryReservationReservationUpdate(d *schema.ResourceData, meta i
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -256,7 +255,6 @@ func resourceBigqueryReservationReservationDelete(d *schema.ResourceData, meta i
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_bigtable_app_profile.go b/google-beta/resource_bigtable_app_profile.go
index fac6414062..3bd0cdd528 100644
--- a/google-beta/resource_bigtable_app_profile.go
+++ b/google-beta/resource_bigtable_app_profile.go
@@ -240,7 +240,6 @@ func resourceBigtableAppProfileUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -313,7 +312,6 @@ func resourceBigtableAppProfileDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_billing_budget.go b/google-beta/resource_billing_budget.go
index f47a70e87a..43969ff5cc 100644
--- a/google-beta/resource_billing_budget.go
+++ b/google-beta/resource_billing_budget.go
@@ -360,7 +360,6 @@ func resourceBillingBudgetUpdate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -401,7 +400,6 @@ func resourceBillingBudgetDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_binary_authorization_attestor.go b/google-beta/resource_binary_authorization_attestor.go
index a1b4a88924..10a2ea8788 100644
--- a/google-beta/resource_binary_authorization_attestor.go
+++ b/google-beta/resource_binary_authorization_attestor.go
@@ -290,7 +290,6 @@ func resourceBinaryAuthorizationAttestorUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -349,7 +348,6 @@ func resourceBinaryAuthorizationAttestorDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_binary_authorization_policy.go b/google-beta/resource_binary_authorization_policy.go
index f18889176c..2f9e5cb110 100644
--- a/google-beta/resource_binary_authorization_policy.go
+++ b/google-beta/resource_binary_authorization_policy.go
@@ -352,7 +352,6 @@ func resourceBinaryAuthorizationPolicyUpdate(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -423,7 +422,6 @@ func resourceBinaryAuthorizationPolicyDelete(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_asset_folder_feed.go b/google-beta/resource_cloud_asset_folder_feed.go
index 8d80918da9..aa7881c017 100644
--- a/google-beta/resource_cloud_asset_folder_feed.go
+++ b/google-beta/resource_cloud_asset_folder_feed.go
@@ -270,7 +270,6 @@ func resourceCloudAssetFolderFeedUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -360,7 +359,6 @@ func resourceCloudAssetFolderFeedDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_asset_organization_feed.go b/google-beta/resource_cloud_asset_organization_feed.go
index 07a0c37680..cccabca287 100644
--- a/google-beta/resource_cloud_asset_organization_feed.go
+++ b/google-beta/resource_cloud_asset_organization_feed.go
@@ -261,7 +261,6 @@ func resourceCloudAssetOrganizationFeedUpdate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -351,7 +350,6 @@ func resourceCloudAssetOrganizationFeedDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_asset_project_feed.go b/google-beta/resource_cloud_asset_project_feed.go
index e1a953b5ca..3ad33698f1 100644
--- a/google-beta/resource_cloud_asset_project_feed.go
+++ b/google-beta/resource_cloud_asset_project_feed.go
@@ -269,7 +269,6 @@ func resourceCloudAssetProjectFeedUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -362,7 +361,6 @@ func resourceCloudAssetProjectFeedDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_build_trigger.go b/google-beta/resource_cloud_build_trigger.go
index d1ab0ed7aa..c2b9da3ca6 100644
--- a/google-beta/resource_cloud_build_trigger.go
+++ b/google-beta/resource_cloud_build_trigger.go
@@ -1070,7 +1070,6 @@ func resourceCloudBuildTriggerUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -1178,7 +1177,6 @@ func resourceCloudBuildTriggerDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_identity_group.go b/google-beta/resource_cloud_identity_group.go
index 7ce73ab525..06ff93bdfb 100644
--- a/google-beta/resource_cloud_identity_group.go
+++ b/google-beta/resource_cloud_identity_group.go
@@ -280,7 +280,6 @@ func resourceCloudIdentityGroupUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -342,7 +341,6 @@ func resourceCloudIdentityGroupDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_identity_group_membership.go b/google-beta/resource_cloud_identity_group_membership.go
index b770be3d50..9cf4c55c21 100644
--- a/google-beta/resource_cloud_identity_group_membership.go
+++ b/google-beta/resource_cloud_identity_group_membership.go
@@ -302,7 +302,6 @@ func resourceCloudIdentityGroupMembershipUpdate(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -355,7 +354,6 @@ func resourceCloudIdentityGroupMembershipDelete(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_iot_device.go b/google-beta/resource_cloud_iot_device.go
index 9b422a3735..372d646b4a 100644
--- a/google-beta/resource_cloud_iot_device.go
+++ b/google-beta/resource_cloud_iot_device.go
@@ -417,7 +417,6 @@ func resourceCloudIotDeviceUpdate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -509,7 +508,6 @@ func resourceCloudIotDeviceDelete(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_iot_device_registry.go b/google-beta/resource_cloud_iot_device_registry.go
index 0b83320bb9..31af2c3d77 100644
--- a/google-beta/resource_cloud_iot_device_registry.go
+++ b/google-beta/resource_cloud_iot_device_registry.go
@@ -523,7 +523,6 @@ func resourceCloudIotDeviceRegistryUpdate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -631,7 +630,6 @@ func resourceCloudIotDeviceRegistryDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_run_domain_mapping.go b/google-beta/resource_cloud_run_domain_mapping.go
index f00f61dc11..6fa9b78aaa 100644
--- a/google-beta/resource_cloud_run_domain_mapping.go
+++ b/google-beta/resource_cloud_run_domain_mapping.go
@@ -446,7 +446,6 @@ func resourceCloudRunDomainMappingDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_run_service.go b/google-beta/resource_cloud_run_service.go
index 7a19d5c96a..a92b290a02 100644
--- a/google-beta/resource_cloud_run_service.go
+++ b/google-beta/resource_cloud_run_service.go
@@ -823,7 +823,6 @@ func resourceCloudRunServiceUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -886,7 +885,6 @@ func resourceCloudRunServiceDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_scheduler_job.go b/google-beta/resource_cloud_scheduler_job.go
index d2b107518c..2fd3090841 100644
--- a/google-beta/resource_cloud_scheduler_job.go
+++ b/google-beta/resource_cloud_scheduler_job.go
@@ -630,7 +630,6 @@ func resourceCloudSchedulerJobDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_cloud_tasks_queue.go b/google-beta/resource_cloud_tasks_queue.go
index c9d9fb8327..e168db4643 100644
--- a/google-beta/resource_cloud_tasks_queue.go
+++ b/google-beta/resource_cloud_tasks_queue.go
@@ -363,7 +363,6 @@ func resourceCloudTasksQueueUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -451,7 +450,6 @@ func resourceCloudTasksQueueDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_address.go b/google-beta/resource_compute_address.go
index c74d0e6ad7..3f5a2f5c99 100644
--- a/google-beta/resource_compute_address.go
+++ b/google-beta/resource_compute_address.go
@@ -393,7 +393,6 @@ func resourceComputeAddressUpdate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -457,7 +456,6 @@ func resourceComputeAddressDelete(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_autoscaler.go b/google-beta/resource_compute_autoscaler.go
index 2df20b526c..cb1802ccb3 100644
--- a/google-beta/resource_compute_autoscaler.go
+++ b/google-beta/resource_compute_autoscaler.go
@@ -477,7 +477,6 @@ func resourceComputeAutoscalerUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -556,7 +555,6 @@ func resourceComputeAutoscalerDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_backend_bucket.go b/google-beta/resource_compute_backend_bucket.go
index 3d089ae6e8..aac12ce6ba 100644
--- a/google-beta/resource_compute_backend_bucket.go
+++ b/google-beta/resource_compute_backend_bucket.go
@@ -263,7 +263,6 @@ func resourceComputeBackendBucketUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -342,7 +341,6 @@ func resourceComputeBackendBucketDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_backend_bucket_signed_url_key.go b/google-beta/resource_compute_backend_bucket_signed_url_key.go
index 752cdb5e1e..9c1f62f5f7 100644
--- a/google-beta/resource_compute_backend_bucket_signed_url_key.go
+++ b/google-beta/resource_compute_backend_bucket_signed_url_key.go
@@ -206,7 +206,6 @@ func resourceComputeBackendBucketSignedUrlKeyDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_backend_service.go b/google-beta/resource_compute_backend_service.go
index 72b59162b2..73bd058c96 100644
--- a/google-beta/resource_compute_backend_service.go
+++ b/google-beta/resource_compute_backend_service.go
@@ -1305,7 +1305,6 @@ func resourceComputeBackendServiceUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -1510,7 +1509,6 @@ func resourceComputeBackendServiceDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_backend_service_signed_url_key.go b/google-beta/resource_compute_backend_service_signed_url_key.go
index 3f2541fa4e..8ead9d28b4 100644
--- a/google-beta/resource_compute_backend_service_signed_url_key.go
+++ b/google-beta/resource_compute_backend_service_signed_url_key.go
@@ -206,7 +206,6 @@ func resourceComputeBackendServiceSignedUrlKeyDelete(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_disk.go b/google-beta/resource_compute_disk.go
index b953b675d7..e96fc3bb07 100644
--- a/google-beta/resource_compute_disk.go
+++ b/google-beta/resource_compute_disk.go
@@ -839,7 +839,6 @@ func resourceComputeDiskUpdate(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -937,7 +936,6 @@ func resourceComputeDiskDelete(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_disk_resource_policy_attachment.go b/google-beta/resource_compute_disk_resource_policy_attachment.go
index 3e315b23dd..ed0f348823 100644
--- a/google-beta/resource_compute_disk_resource_policy_attachment.go
+++ b/google-beta/resource_compute_disk_resource_policy_attachment.go
@@ -208,7 +208,6 @@ func resourceComputeDiskResourcePolicyAttachmentDelete(d *schema.ResourceData, m
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_external_vpn_gateway.go b/google-beta/resource_compute_external_vpn_gateway.go
index 9f1072f6ec..d313297b53 100644
--- a/google-beta/resource_compute_external_vpn_gateway.go
+++ b/google-beta/resource_compute_external_vpn_gateway.go
@@ -247,7 +247,6 @@ func resourceComputeExternalVpnGatewayDelete(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_firewall.go b/google-beta/resource_compute_firewall.go
index f1462b0537..57c15dc8b6 100644
--- a/google-beta/resource_compute_firewall.go
+++ b/google-beta/resource_compute_firewall.go
@@ -616,7 +616,6 @@ func resourceComputeFirewallUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -743,7 +742,6 @@ func resourceComputeFirewallDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_forwarding_rule.go b/google-beta/resource_compute_forwarding_rule.go
index 1cf201fea4..52b7b4a9f2 100644
--- a/google-beta/resource_compute_forwarding_rule.go
+++ b/google-beta/resource_compute_forwarding_rule.go
@@ -619,7 +619,6 @@ func resourceComputeForwardingRuleUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -751,7 +750,6 @@ func resourceComputeForwardingRuleDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_global_address.go b/google-beta/resource_compute_global_address.go
index 944d8aafb5..7394e8f669 100644
--- a/google-beta/resource_compute_global_address.go
+++ b/google-beta/resource_compute_global_address.go
@@ -383,7 +383,6 @@ func resourceComputeGlobalAddressUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -447,7 +446,6 @@ func resourceComputeGlobalAddressDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_global_forwarding_rule.go b/google-beta/resource_compute_global_forwarding_rule.go
index cc5dd47059..550d946fe4 100644
--- a/google-beta/resource_compute_global_forwarding_rule.go
+++ b/google-beta/resource_compute_global_forwarding_rule.go
@@ -510,7 +510,6 @@ func resourceComputeGlobalForwardingRuleUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -608,7 +607,6 @@ func resourceComputeGlobalForwardingRuleDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_global_network_endpoint.go b/google-beta/resource_compute_global_network_endpoint.go
index 25be035f24..8ee5592541 100644
--- a/google-beta/resource_compute_global_network_endpoint.go
+++ b/google-beta/resource_compute_global_network_endpoint.go
@@ -238,7 +238,6 @@ func resourceComputeGlobalNetworkEndpointDelete(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_global_network_endpoint_group.go b/google-beta/resource_compute_global_network_endpoint_group.go
index 8745f3ecd0..432cf50027 100644
--- a/google-beta/resource_compute_global_network_endpoint_group.go
+++ b/google-beta/resource_compute_global_network_endpoint_group.go
@@ -227,7 +227,6 @@ func resourceComputeGlobalNetworkEndpointGroupDelete(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_ha_vpn_gateway.go b/google-beta/resource_compute_ha_vpn_gateway.go
index 508461d3bb..9d0bd89a4e 100644
--- a/google-beta/resource_compute_ha_vpn_gateway.go
+++ b/google-beta/resource_compute_ha_vpn_gateway.go
@@ -248,7 +248,6 @@ func resourceComputeHaVpnGatewayDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_health_check.go b/google-beta/resource_compute_health_check.go
index 9bdf1912b7..a1740b44c0 100644
--- a/google-beta/resource_compute_health_check.go
+++ b/google-beta/resource_compute_health_check.go
@@ -886,7 +886,6 @@ func resourceComputeHealthCheckUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -1018,7 +1017,6 @@ func resourceComputeHealthCheckDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_http_health_check.go b/google-beta/resource_compute_http_health_check.go
index 8617f5f623..5b455c3b72 100644
--- a/google-beta/resource_compute_http_health_check.go
+++ b/google-beta/resource_compute_http_health_check.go
@@ -315,7 +315,6 @@ func resourceComputeHttpHealthCheckUpdate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -418,7 +417,6 @@ func resourceComputeHttpHealthCheckDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_https_health_check.go b/google-beta/resource_compute_https_health_check.go
index 153bc0bbdb..48492992a4 100644
--- a/google-beta/resource_compute_https_health_check.go
+++ b/google-beta/resource_compute_https_health_check.go
@@ -315,7 +315,6 @@ func resourceComputeHttpsHealthCheckUpdate(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -418,7 +417,6 @@ func resourceComputeHttpsHealthCheckDelete(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_image.go b/google-beta/resource_compute_image.go
index fbca3ae742..913f9dca99 100644
--- a/google-beta/resource_compute_image.go
+++ b/google-beta/resource_compute_image.go
@@ -438,7 +438,6 @@ func resourceComputeImageUpdate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -502,7 +501,6 @@ func resourceComputeImageDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_instance_group_named_port.go b/google-beta/resource_compute_instance_group_named_port.go
index dc9d3fdbde..1e0c563998 100644
--- a/google-beta/resource_compute_instance_group_named_port.go
+++ b/google-beta/resource_compute_instance_group_named_port.go
@@ -225,7 +225,6 @@ func resourceComputeInstanceGroupNamedPortDelete(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_interconnect_attachment.go b/google-beta/resource_compute_interconnect_attachment.go
index e6f59c1efe..972647ef42 100644
--- a/google-beta/resource_compute_interconnect_attachment.go
+++ b/google-beta/resource_compute_interconnect_attachment.go
@@ -467,7 +467,6 @@ func resourceComputeInterconnectAttachmentUpdate(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -534,7 +533,6 @@ func resourceComputeInterconnectAttachmentDelete(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_machine_image.go b/google-beta/resource_compute_machine_image.go
index 6470708769..a6fae42239 100644
--- a/google-beta/resource_compute_machine_image.go
+++ b/google-beta/resource_compute_machine_image.go
@@ -190,7 +190,6 @@ func resourceComputeMachineImageUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -249,7 +248,6 @@ func resourceComputeMachineImageDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_managed_ssl_certificate.go b/google-beta/resource_compute_managed_ssl_certificate.go
index e7feb2faa7..67c3aa709e 100644
--- a/google-beta/resource_compute_managed_ssl_certificate.go
+++ b/google-beta/resource_compute_managed_ssl_certificate.go
@@ -283,7 +283,6 @@ func resourceComputeManagedSslCertificateDelete(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_network.go b/google-beta/resource_compute_network.go
index 51cbfb27ce..5217481673 100644
--- a/google-beta/resource_compute_network.go
+++ b/google-beta/resource_compute_network.go
@@ -320,7 +320,6 @@ func resourceComputeNetworkUpdate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -378,7 +377,6 @@ func resourceComputeNetworkDelete(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_network_endpoint.go b/google-beta/resource_compute_network_endpoint.go
index a2f29621c7..5899945d2a 100644
--- a/google-beta/resource_compute_network_endpoint.go
+++ b/google-beta/resource_compute_network_endpoint.go
@@ -249,7 +249,6 @@ func resourceComputeNetworkEndpointDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_network_endpoint_group.go b/google-beta/resource_compute_network_endpoint_group.go
index 1aa0b98659..12f3ffe91d 100644
--- a/google-beta/resource_compute_network_endpoint_group.go
+++ b/google-beta/resource_compute_network_endpoint_group.go
@@ -286,7 +286,6 @@ func resourceComputeNetworkEndpointGroupDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_network_peering_routes_config.go b/google-beta/resource_compute_network_peering_routes_config.go
index 6a14eaa7f6..07f8583af2 100644
--- a/google-beta/resource_compute_network_peering_routes_config.go
+++ b/google-beta/resource_compute_network_peering_routes_config.go
@@ -222,7 +222,6 @@ func resourceComputeNetworkPeeringRoutesConfigUpdate(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -296,13 +295,6 @@ func resourceComputeNetworkPeeringRoutesConfigUpdate(d *schema.ResourceData, met
 }
 
 func resourceComputeNetworkPeeringRoutesConfigDelete(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*Config)
-	userAgent, err := generateUserAgentString(d, config.userAgent)
-	if err != nil {
-		return err
-	}
-	config.userAgent = userAgent
-
 	log.Printf("[WARNING] Compute NetworkPeeringRoutesConfig resources"+
 		" cannot be deleted from GCP. The resource %s will be removed from Terraform"+
 		" state, but will still be present on the server.", d.Id())
diff --git a/google-beta/resource_compute_network_peering_routes_config_generated_test.go b/google-beta/resource_compute_network_peering_routes_config_generated_test.go
index bc1c3e236f..df16a7441c 100644
--- a/google-beta/resource_compute_network_peering_routes_config_generated_test.go
+++ b/google-beta/resource_compute_network_peering_routes_config_generated_test.go
@@ -15,12 +15,9 @@
 package google
 
 import (
-	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
 func TestAccComputeNetworkPeeringRoutesConfig_networkPeeringRoutesConfigBasicExample(t *testing.T) {
@@ -36,7 +33,6 @@ func TestAccComputeNetworkPeeringRoutesConfig_networkPeeringRoutesConfigBasicExa
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 		},
-		CheckDestroy: testAccCheckComputeNetworkPeeringRoutesConfigDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccComputeNetworkPeeringRoutesConfig_networkPeeringRoutesConfigBasicExample(context),
@@ -101,7 +97,6 @@ func TestAccComputeNetworkPeeringRoutesConfig_networkPeeringRoutesConfigGkeExamp
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 		},
-		CheckDestroy: testAccCheckComputeNetworkPeeringRoutesConfigDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccComputeNetworkPeeringRoutesConfig_networkPeeringRoutesConfigGkeExample(context),
@@ -172,30 +167,3 @@ resource "google_container_cluster" "private_cluster" {
 }
 `, context)
 }
-
-func testAccCheckComputeNetworkPeeringRoutesConfigDestroyProducer(t *testing.T) func(s *terraform.State) error {
-	return func(s *terraform.State) error {
-		for name, rs := range s.RootModule().Resources {
-			if rs.Type != "google_compute_network_peering_routes_config" {
-				continue
-			}
-			if strings.HasPrefix(name, "data.") {
-				continue
-			}
-
-			config := googleProviderConfig(t)
-
-			url, err := replaceVarsForTest(config, rs, "{{ComputeBasePath}}projects/{{project}}/global/networks/{{network}}")
-			if err != nil {
-				return err
-			}
-
-			_, err = sendRequest(config, "GET", "", url, config.userAgent, nil)
-			if err == nil {
-				return fmt.Errorf("ComputeNetworkPeeringRoutesConfig still exists at %s", url)
-			}
-		}
-
-		return nil
-	}
-}
diff --git a/google-beta/resource_compute_node_group.go b/google-beta/resource_compute_node_group.go
index e5c69a7151..74a9bfc49f 100644
--- a/google-beta/resource_compute_node_group.go
+++ b/google-beta/resource_compute_node_group.go
@@ -311,7 +311,6 @@ func resourceComputeNodeGroupUpdate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -369,7 +368,6 @@ func resourceComputeNodeGroupDelete(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_node_template.go b/google-beta/resource_compute_node_template.go
index f8e1ad849f..2dfd94a840 100644
--- a/google-beta/resource_compute_node_template.go
+++ b/google-beta/resource_compute_node_template.go
@@ -346,7 +346,6 @@ func resourceComputeNodeTemplateDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_organization_security_policy.go b/google-beta/resource_compute_organization_security_policy.go
index 0f7e1d3b0b..e167ee6d20 100644
--- a/google-beta/resource_compute_organization_security_policy.go
+++ b/google-beta/resource_compute_organization_security_policy.go
@@ -233,7 +233,6 @@ func resourceComputeOrganizationSecurityPolicyUpdate(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -290,7 +289,6 @@ func resourceComputeOrganizationSecurityPolicyDelete(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_organization_security_policy_association.go b/google-beta/resource_compute_organization_security_policy_association.go
index 66de33f2e4..e83f9a15d4 100644
--- a/google-beta/resource_compute_organization_security_policy_association.go
+++ b/google-beta/resource_compute_organization_security_policy_association.go
@@ -185,7 +185,6 @@ func resourceComputeOrganizationSecurityPolicyAssociationDelete(d *schema.Resour
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_organization_security_policy_rule.go b/google-beta/resource_compute_organization_security_policy_rule.go
index 72111c6b5b..0ccaf9aac0 100644
--- a/google-beta/resource_compute_organization_security_policy_rule.go
+++ b/google-beta/resource_compute_organization_security_policy_rule.go
@@ -375,7 +375,6 @@ func resourceComputeOrganizationSecurityPolicyRuleUpdate(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -488,7 +487,6 @@ func resourceComputeOrganizationSecurityPolicyRuleDelete(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_packet_mirroring.go b/google-beta/resource_compute_packet_mirroring.go
index 68e13f11eb..c7fccdc124 100644
--- a/google-beta/resource_compute_packet_mirroring.go
+++ b/google-beta/resource_compute_packet_mirroring.go
@@ -367,7 +367,6 @@ func resourceComputePacketMirroringUpdate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -458,7 +457,6 @@ func resourceComputePacketMirroringDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_per_instance_config.go b/google-beta/resource_compute_per_instance_config.go
index 7239ac53ed..709db534e8 100644
--- a/google-beta/resource_compute_per_instance_config.go
+++ b/google-beta/resource_compute_per_instance_config.go
@@ -303,7 +303,6 @@ func resourceComputePerInstanceConfigUpdate(d *schema.ResourceData, meta interfa
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -416,7 +415,6 @@ func resourceComputePerInstanceConfigDelete(d *schema.ResourceData, meta interfa
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	project, err := getProject(d, config)
 	if err != nil {
diff --git a/google-beta/resource_compute_region_autoscaler.go b/google-beta/resource_compute_region_autoscaler.go
index 5bb93eda82..4377dbc44c 100644
--- a/google-beta/resource_compute_region_autoscaler.go
+++ b/google-beta/resource_compute_region_autoscaler.go
@@ -476,7 +476,6 @@ func resourceComputeRegionAutoscalerUpdate(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -555,7 +554,6 @@ func resourceComputeRegionAutoscalerDelete(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_region_backend_service.go b/google-beta/resource_compute_region_backend_service.go
index 1b0e5400de..fa77d287e8 100644
--- a/google-beta/resource_compute_region_backend_service.go
+++ b/google-beta/resource_compute_region_backend_service.go
@@ -1152,7 +1152,6 @@ func resourceComputeRegionBackendServiceUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -1326,7 +1325,6 @@ func resourceComputeRegionBackendServiceDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_region_disk.go b/google-beta/resource_compute_region_disk.go
index be9cad0f5b..56650b2a7a 100644
--- a/google-beta/resource_compute_region_disk.go
+++ b/google-beta/resource_compute_region_disk.go
@@ -511,7 +511,6 @@ func resourceComputeRegionDiskUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -609,7 +608,6 @@ func resourceComputeRegionDiskDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_region_disk_resource_policy_attachment.go b/google-beta/resource_compute_region_disk_resource_policy_attachment.go
index d82e00d5a7..7e262b39fd 100644
--- a/google-beta/resource_compute_region_disk_resource_policy_attachment.go
+++ b/google-beta/resource_compute_region_disk_resource_policy_attachment.go
@@ -208,7 +208,6 @@ func resourceComputeRegionDiskResourcePolicyAttachmentDelete(d *schema.ResourceD
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_region_health_check.go b/google-beta/resource_compute_region_health_check.go
index 9ccc524a6b..07c24109d1 100644
--- a/google-beta/resource_compute_region_health_check.go
+++ b/google-beta/resource_compute_region_health_check.go
@@ -820,7 +820,6 @@ func resourceComputeRegionHealthCheckUpdate(d *schema.ResourceData, meta interfa
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -958,7 +957,6 @@ func resourceComputeRegionHealthCheckDelete(d *schema.ResourceData, meta interfa
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_region_network_endpoint_group.go b/google-beta/resource_compute_region_network_endpoint_group.go
index b8a1b22d25..9e28d79a78 100644
--- a/google-beta/resource_compute_region_network_endpoint_group.go
+++ b/google-beta/resource_compute_region_network_endpoint_group.go
@@ -376,7 +376,6 @@ func resourceComputeRegionNetworkEndpointGroupDelete(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_region_per_instance_config.go b/google-beta/resource_compute_region_per_instance_config.go
index 145526e34d..5d402f1521 100644
--- a/google-beta/resource_compute_region_per_instance_config.go
+++ b/google-beta/resource_compute_region_per_instance_config.go
@@ -303,7 +303,6 @@ func resourceComputeRegionPerInstanceConfigUpdate(d *schema.ResourceData, meta i
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -416,7 +415,6 @@ func resourceComputeRegionPerInstanceConfigDelete(d *schema.ResourceData, meta i
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	project, err := getProject(d, config)
 	if err != nil {
diff --git a/google-beta/resource_compute_region_ssl_certificate.go b/google-beta/resource_compute_region_ssl_certificate.go
index ca7c7e41aa..9661670667 100644
--- a/google-beta/resource_compute_region_ssl_certificate.go
+++ b/google-beta/resource_compute_region_ssl_certificate.go
@@ -281,7 +281,6 @@ func resourceComputeRegionSslCertificateDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_region_target_http_proxy.go b/google-beta/resource_compute_region_target_http_proxy.go
index c24bae5a7d..d5e9b8f214 100644
--- a/google-beta/resource_compute_region_target_http_proxy.go
+++ b/google-beta/resource_compute_region_target_http_proxy.go
@@ -244,7 +244,6 @@ func resourceComputeRegionTargetHttpProxyUpdate(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -302,7 +301,6 @@ func resourceComputeRegionTargetHttpProxyDelete(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_region_target_https_proxy.go b/google-beta/resource_compute_region_target_https_proxy.go
index 5891c9b781..375d34cac1 100644
--- a/google-beta/resource_compute_region_target_https_proxy.go
+++ b/google-beta/resource_compute_region_target_https_proxy.go
@@ -264,7 +264,6 @@ func resourceComputeRegionTargetHttpsProxyUpdate(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -356,7 +355,6 @@ func resourceComputeRegionTargetHttpsProxyDelete(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_region_url_map.go b/google-beta/resource_compute_region_url_map.go
index 6c980acf58..994ad30c23 100644
--- a/google-beta/resource_compute_region_url_map.go
+++ b/google-beta/resource_compute_region_url_map.go
@@ -1934,7 +1934,6 @@ func resourceComputeRegionUrlMapUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -2037,7 +2036,6 @@ func resourceComputeRegionUrlMapDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_reservation.go b/google-beta/resource_compute_reservation.go
index 6b556e21f0..b06b76c5cc 100644
--- a/google-beta/resource_compute_reservation.go
+++ b/google-beta/resource_compute_reservation.go
@@ -363,7 +363,6 @@ func resourceComputeReservationUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -426,7 +425,6 @@ func resourceComputeReservationDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_resource_policy.go b/google-beta/resource_compute_resource_policy.go
index a47c020c46..8ff21d7ded 100644
--- a/google-beta/resource_compute_resource_policy.go
+++ b/google-beta/resource_compute_resource_policy.go
@@ -436,7 +436,6 @@ func resourceComputeResourcePolicyDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_route.go b/google-beta/resource_compute_route.go
index fe801c6f95..5e3321394c 100644
--- a/google-beta/resource_compute_route.go
+++ b/google-beta/resource_compute_route.go
@@ -399,7 +399,6 @@ func resourceComputeRouteDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_router.go b/google-beta/resource_compute_router.go
index cf1f1376af..5b13171230 100644
--- a/google-beta/resource_compute_router.go
+++ b/google-beta/resource_compute_router.go
@@ -336,7 +336,6 @@ func resourceComputeRouterUpdate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -404,7 +403,6 @@ func resourceComputeRouterDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_router_bgp_peer.go b/google-beta/resource_compute_router_bgp_peer.go
index 9d8223ebcc..1ff16a4461 100644
--- a/google-beta/resource_compute_router_bgp_peer.go
+++ b/google-beta/resource_compute_router_bgp_peer.go
@@ -383,7 +383,6 @@ func resourceComputeRouterBgpPeerUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -456,7 +455,6 @@ func resourceComputeRouterBgpPeerDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_router_nat.go b/google-beta/resource_compute_router_nat.go
index ec52cd8e38..8655e7d10e 100644
--- a/google-beta/resource_compute_router_nat.go
+++ b/google-beta/resource_compute_router_nat.go
@@ -531,7 +531,6 @@ func resourceComputeRouterNatUpdate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -658,7 +657,6 @@ func resourceComputeRouterNatDelete(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_snapshot.go b/google-beta/resource_compute_snapshot.go
index 7c5692b418..e50f9b3e04 100644
--- a/google-beta/resource_compute_snapshot.go
+++ b/google-beta/resource_compute_snapshot.go
@@ -421,7 +421,6 @@ func resourceComputeSnapshotUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -485,7 +484,6 @@ func resourceComputeSnapshotDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_ssl_certificate.go b/google-beta/resource_compute_ssl_certificate.go
index 59afd6c450..cb8dd49602 100644
--- a/google-beta/resource_compute_ssl_certificate.go
+++ b/google-beta/resource_compute_ssl_certificate.go
@@ -263,7 +263,6 @@ func resourceComputeSslCertificateDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_ssl_policy.go b/google-beta/resource_compute_ssl_policy.go
index f0eed60f38..49c0798fb4 100644
--- a/google-beta/resource_compute_ssl_policy.go
+++ b/google-beta/resource_compute_ssl_policy.go
@@ -314,7 +314,6 @@ func resourceComputeSslPolicyUpdate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -386,7 +385,6 @@ func resourceComputeSslPolicyDelete(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_subnetwork.go b/google-beta/resource_compute_subnetwork.go
index 4ee7a9f27f..b4f6f05514 100644
--- a/google-beta/resource_compute_subnetwork.go
+++ b/google-beta/resource_compute_subnetwork.go
@@ -518,7 +518,6 @@ func resourceComputeSubnetworkUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -763,7 +762,6 @@ func resourceComputeSubnetworkDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_target_grpc_proxy.go b/google-beta/resource_compute_target_grpc_proxy.go
index a9175d4c4a..4da22c993c 100644
--- a/google-beta/resource_compute_target_grpc_proxy.go
+++ b/google-beta/resource_compute_target_grpc_proxy.go
@@ -270,7 +270,6 @@ func resourceComputeTargetGrpcProxyUpdate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -331,7 +330,6 @@ func resourceComputeTargetGrpcProxyDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_target_http_proxy.go b/google-beta/resource_compute_target_http_proxy.go
index 47d615b3e1..d2c273c7bd 100644
--- a/google-beta/resource_compute_target_http_proxy.go
+++ b/google-beta/resource_compute_target_http_proxy.go
@@ -226,7 +226,6 @@ func resourceComputeTargetHttpProxyUpdate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -284,7 +283,6 @@ func resourceComputeTargetHttpProxyDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_target_https_proxy.go b/google-beta/resource_compute_target_https_proxy.go
index 91eb1404ca..a42acfee42 100644
--- a/google-beta/resource_compute_target_https_proxy.go
+++ b/google-beta/resource_compute_target_https_proxy.go
@@ -284,7 +284,6 @@ func resourceComputeTargetHttpsProxyUpdate(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -444,7 +443,6 @@ func resourceComputeTargetHttpsProxyDelete(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_target_instance.go b/google-beta/resource_compute_target_instance.go
index 00a173b599..36a69e4508 100644
--- a/google-beta/resource_compute_target_instance.go
+++ b/google-beta/resource_compute_target_instance.go
@@ -272,7 +272,6 @@ func resourceComputeTargetInstanceDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_target_ssl_proxy.go b/google-beta/resource_compute_target_ssl_proxy.go
index 77456dc5d5..483e7f36a5 100644
--- a/google-beta/resource_compute_target_ssl_proxy.go
+++ b/google-beta/resource_compute_target_ssl_proxy.go
@@ -281,7 +281,6 @@ func resourceComputeTargetSslProxyUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -441,7 +440,6 @@ func resourceComputeTargetSslProxyDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_target_tcp_proxy.go b/google-beta/resource_compute_target_tcp_proxy.go
index 481e96fa30..ed6e181bec 100644
--- a/google-beta/resource_compute_target_tcp_proxy.go
+++ b/google-beta/resource_compute_target_tcp_proxy.go
@@ -243,7 +243,6 @@ func resourceComputeTargetTcpProxyUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -335,7 +334,6 @@ func resourceComputeTargetTcpProxyDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_url_map.go b/google-beta/resource_compute_url_map.go
index b9ac987ff3..6c157f7804 100644
--- a/google-beta/resource_compute_url_map.go
+++ b/google-beta/resource_compute_url_map.go
@@ -2954,7 +2954,6 @@ func resourceComputeUrlMapUpdate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -3063,7 +3062,6 @@ func resourceComputeUrlMapDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_vpn_gateway.go b/google-beta/resource_compute_vpn_gateway.go
index d91580f72b..88e4bdaca6 100644
--- a/google-beta/resource_compute_vpn_gateway.go
+++ b/google-beta/resource_compute_vpn_gateway.go
@@ -241,7 +241,6 @@ func resourceComputeVpnGatewayDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_compute_vpn_tunnel.go b/google-beta/resource_compute_vpn_tunnel.go
index 9c5aa9d43b..a772e15b57 100644
--- a/google-beta/resource_compute_vpn_tunnel.go
+++ b/google-beta/resource_compute_vpn_tunnel.go
@@ -631,7 +631,6 @@ func resourceComputeVpnTunnelUpdate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -695,7 +694,6 @@ func resourceComputeVpnTunnelDelete(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_container_analysis_note.go b/google-beta/resource_container_analysis_note.go
index 3aaec20090..0f0ed3fade 100644
--- a/google-beta/resource_container_analysis_note.go
+++ b/google-beta/resource_container_analysis_note.go
@@ -347,7 +347,6 @@ func resourceContainerAnalysisNoteUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -467,7 +466,6 @@ func resourceContainerAnalysisNoteDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_container_analysis_occurrence.go b/google-beta/resource_container_analysis_occurrence.go
index 77e59623fa..5224d0c447 100644
--- a/google-beta/resource_container_analysis_occurrence.go
+++ b/google-beta/resource_container_analysis_occurrence.go
@@ -326,7 +326,6 @@ func resourceContainerAnalysisOccurrenceUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -406,7 +405,6 @@ func resourceContainerAnalysisOccurrenceDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_data_catalog_entry.go b/google-beta/resource_data_catalog_entry.go
index c904f572e9..cd414535a3 100644
--- a/google-beta/resource_data_catalog_entry.go
+++ b/google-beta/resource_data_catalog_entry.go
@@ -423,7 +423,6 @@ func resourceDataCatalogEntryUpdate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -538,7 +537,6 @@ func resourceDataCatalogEntryDelete(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_data_catalog_entry_group.go b/google-beta/resource_data_catalog_entry_group.go
index ab4fb5954b..1d8011a8e7 100644
--- a/google-beta/resource_data_catalog_entry_group.go
+++ b/google-beta/resource_data_catalog_entry_group.go
@@ -204,7 +204,6 @@ func resourceDataCatalogEntryGroupUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -272,7 +271,6 @@ func resourceDataCatalogEntryGroupDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_data_catalog_tag.go b/google-beta/resource_data_catalog_tag.go
index 9e0eb982de..4ff843bed1 100644
--- a/google-beta/resource_data_catalog_tag.go
+++ b/google-beta/resource_data_catalog_tag.go
@@ -262,7 +262,6 @@ func resourceDataCatalogTagUpdate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -329,7 +328,6 @@ func resourceDataCatalogTagDelete(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_data_catalog_tag_template.go b/google-beta/resource_data_catalog_tag_template.go
index c190797ef3..d7021d5d8e 100644
--- a/google-beta/resource_data_catalog_tag_template.go
+++ b/google-beta/resource_data_catalog_tag_template.go
@@ -293,7 +293,6 @@ func resourceDataCatalogTagTemplateUpdate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -351,7 +350,6 @@ func resourceDataCatalogTagTemplateDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_data_fusion_instance.go b/google-beta/resource_data_fusion_instance.go
index 3f86739427..ea8de4469e 100644
--- a/google-beta/resource_data_fusion_instance.go
+++ b/google-beta/resource_data_fusion_instance.go
@@ -413,7 +413,6 @@ func resourceDataFusionInstanceUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -480,7 +479,6 @@ func resourceDataFusionInstanceDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_data_loss_prevention_deidentify_template.go b/google-beta/resource_data_loss_prevention_deidentify_template.go
index 262b337de9..f0ad332dd0 100644
--- a/google-beta/resource_data_loss_prevention_deidentify_template.go
+++ b/google-beta/resource_data_loss_prevention_deidentify_template.go
@@ -396,7 +396,6 @@ func resourceDataLossPreventionDeidentifyTemplateUpdate(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -473,7 +472,6 @@ func resourceDataLossPreventionDeidentifyTemplateDelete(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_data_loss_prevention_inspect_template.go b/google-beta/resource_data_loss_prevention_inspect_template.go
index 6a972a7dfe..edc6f35ed7 100644
--- a/google-beta/resource_data_loss_prevention_inspect_template.go
+++ b/google-beta/resource_data_loss_prevention_inspect_template.go
@@ -520,7 +520,6 @@ func resourceDataLossPreventionInspectTemplateUpdate(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -597,7 +596,6 @@ func resourceDataLossPreventionInspectTemplateDelete(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_data_loss_prevention_job_trigger.go b/google-beta/resource_data_loss_prevention_job_trigger.go
index 89a7f0d713..aeb36854ed 100644
--- a/google-beta/resource_data_loss_prevention_job_trigger.go
+++ b/google-beta/resource_data_loss_prevention_job_trigger.go
@@ -571,7 +571,6 @@ func resourceDataLossPreventionJobTriggerUpdate(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -668,7 +667,6 @@ func resourceDataLossPreventionJobTriggerDelete(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_data_loss_prevention_stored_info_type.go b/google-beta/resource_data_loss_prevention_stored_info_type.go
index d0b57f8d2e..06821d46b0 100644
--- a/google-beta/resource_data_loss_prevention_stored_info_type.go
+++ b/google-beta/resource_data_loss_prevention_stored_info_type.go
@@ -429,7 +429,6 @@ func resourceDataLossPreventionStoredInfoTypeUpdate(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -496,7 +495,6 @@ func resourceDataLossPreventionStoredInfoTypeDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_dataproc_autoscaling_policy.go b/google-beta/resource_dataproc_autoscaling_policy.go
index 5051878f53..b07aefddc7 100644
--- a/google-beta/resource_dataproc_autoscaling_policy.go
+++ b/google-beta/resource_dataproc_autoscaling_policy.go
@@ -371,7 +371,6 @@ func resourceDataprocAutoscalingPolicyUpdate(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -436,7 +435,6 @@ func resourceDataprocAutoscalingPolicyDelete(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_datastore_index.go b/google-beta/resource_datastore_index.go
index 299a099793..7a4de907a9 100644
--- a/google-beta/resource_datastore_index.go
+++ b/google-beta/resource_datastore_index.go
@@ -235,7 +235,6 @@ func resourceDatastoreIndexDelete(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_deployment_manager_deployment.go b/google-beta/resource_deployment_manager_deployment.go
index 7135c86f4c..aafcc91d38 100644
--- a/google-beta/resource_deployment_manager_deployment.go
+++ b/google-beta/resource_deployment_manager_deployment.go
@@ -359,7 +359,6 @@ func resourceDeploymentManagerDeploymentUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -490,7 +489,6 @@ func resourceDeploymentManagerDeploymentDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_dialogflow_agent.go b/google-beta/resource_dialogflow_agent.go
index 27e4b93c3c..293379bec9 100644
--- a/google-beta/resource_dialogflow_agent.go
+++ b/google-beta/resource_dialogflow_agent.go
@@ -330,7 +330,6 @@ func resourceDialogflowAgentUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -437,7 +436,6 @@ func resourceDialogflowAgentDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_dialogflow_entity_type.go b/google-beta/resource_dialogflow_entity_type.go
index b29526a09d..ed4e6a46e0 100644
--- a/google-beta/resource_dialogflow_entity_type.go
+++ b/google-beta/resource_dialogflow_entity_type.go
@@ -258,7 +258,6 @@ func resourceDialogflowEntityTypeUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -323,7 +322,6 @@ func resourceDialogflowEntityTypeDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_dialogflow_intent.go b/google-beta/resource_dialogflow_intent.go
index 18ff2b5594..2790939ef2 100644
--- a/google-beta/resource_dialogflow_intent.go
+++ b/google-beta/resource_dialogflow_intent.go
@@ -395,7 +395,6 @@ func resourceDialogflowIntentUpdate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -496,7 +495,6 @@ func resourceDialogflowIntentDelete(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_dns_managed_zone.go b/google-beta/resource_dns_managed_zone.go
index 0edfd56ce0..673d80f445 100644
--- a/google-beta/resource_dns_managed_zone.go
+++ b/google-beta/resource_dns_managed_zone.go
@@ -541,7 +541,6 @@ func resourceDNSManagedZoneUpdate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -618,7 +617,6 @@ func resourceDNSManagedZoneDelete(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_dns_policy.go b/google-beta/resource_dns_policy.go
index cc5b7caa59..8dd014a4ce 100644
--- a/google-beta/resource_dns_policy.go
+++ b/google-beta/resource_dns_policy.go
@@ -302,7 +302,6 @@ func resourceDNSPolicyUpdate(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -378,7 +377,6 @@ func resourceDNSPolicyDelete(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_filestore_instance.go b/google-beta/resource_filestore_instance.go
index 243f6b25a2..0d718acb88 100644
--- a/google-beta/resource_filestore_instance.go
+++ b/google-beta/resource_filestore_instance.go
@@ -371,7 +371,6 @@ func resourceFilestoreInstanceUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -457,7 +456,6 @@ func resourceFilestoreInstanceDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_firebase_web_app.go b/google-beta/resource_firebase_web_app.go
index 05a6620b80..5a5db15241 100644
--- a/google-beta/resource_firebase_web_app.go
+++ b/google-beta/resource_firebase_web_app.go
@@ -198,7 +198,6 @@ func resourceFirebaseWebAppUpdate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_firestore_index.go b/google-beta/resource_firestore_index.go
index 5b89082a56..b23504cc4e 100644
--- a/google-beta/resource_firestore_index.go
+++ b/google-beta/resource_firestore_index.go
@@ -276,7 +276,6 @@ func resourceFirestoreIndexDelete(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_game_services_game_server_cluster.go b/google-beta/resource_game_services_game_server_cluster.go
index e1666dd448..8b4fedc07b 100644
--- a/google-beta/resource_game_services_game_server_cluster.go
+++ b/google-beta/resource_game_services_game_server_cluster.go
@@ -289,7 +289,6 @@ func resourceGameServicesGameServerClusterUpdate(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -365,7 +364,6 @@ func resourceGameServicesGameServerClusterDelete(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_game_services_game_server_config.go b/google-beta/resource_game_services_game_server_config.go
index e383e62faa..bbadaadc14 100644
--- a/google-beta/resource_game_services_game_server_config.go
+++ b/google-beta/resource_game_services_game_server_config.go
@@ -359,7 +359,6 @@ func resourceGameServicesGameServerConfigDelete(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_game_services_game_server_deployment.go b/google-beta/resource_game_services_game_server_deployment.go
index 09d079bcb6..e67674ec49 100644
--- a/google-beta/resource_game_services_game_server_deployment.go
+++ b/google-beta/resource_game_services_game_server_deployment.go
@@ -219,7 +219,6 @@ func resourceGameServicesGameServerDeploymentUpdate(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -295,7 +294,6 @@ func resourceGameServicesGameServerDeploymentDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_game_services_game_server_deployment_rollout.go b/google-beta/resource_game_services_game_server_deployment_rollout.go
index efcb3f75b4..8592878c06 100644
--- a/google-beta/resource_game_services_game_server_deployment_rollout.go
+++ b/google-beta/resource_game_services_game_server_deployment_rollout.go
@@ -181,7 +181,6 @@ func resourceGameServicesGameServerDeploymentRolloutUpdate(d *schema.ResourceDat
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -257,7 +256,6 @@ func resourceGameServicesGameServerDeploymentRolloutDelete(d *schema.ResourceDat
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_game_services_realm.go b/google-beta/resource_game_services_realm.go
index e72bc746da..fefcd87845 100644
--- a/google-beta/resource_game_services_realm.go
+++ b/google-beta/resource_game_services_realm.go
@@ -239,7 +239,6 @@ func resourceGameServicesRealmUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -325,7 +324,6 @@ func resourceGameServicesRealmDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_google_project_service.go b/google-beta/resource_google_project_service.go
index 60a486dd51..0ad1dc8af2 100644
--- a/google-beta/resource_google_project_service.go
+++ b/google-beta/resource_google_project_service.go
@@ -119,11 +119,6 @@ func resourceGoogleProjectServiceImport(d *schema.ResourceData, m interface{}) (
 
 func resourceGoogleProjectServiceCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
-	userAgent, err := generateUserAgentString(d, config.userAgent)
-	if err != nil {
-		return err
-	}
-	config.userAgent = userAgent
 
 	project, err := getProject(d, config)
 	if err != nil {
diff --git a/google-beta/resource_healthcare_dataset.go b/google-beta/resource_healthcare_dataset.go
index cd28caf4d5..5d53a93d58 100644
--- a/google-beta/resource_healthcare_dataset.go
+++ b/google-beta/resource_healthcare_dataset.go
@@ -196,7 +196,6 @@ func resourceHealthcareDatasetUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -254,7 +253,6 @@ func resourceHealthcareDatasetDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_healthcare_dicom_store.go b/google-beta/resource_healthcare_dicom_store.go
index 4656607c36..0735b05859 100644
--- a/google-beta/resource_healthcare_dicom_store.go
+++ b/google-beta/resource_healthcare_dicom_store.go
@@ -216,7 +216,6 @@ func resourceHealthcareDicomStoreUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -278,7 +277,6 @@ func resourceHealthcareDicomStoreDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_healthcare_fhir_store.go b/google-beta/resource_healthcare_fhir_store.go
index f56bf6cb7b..4630d20ebf 100644
--- a/google-beta/resource_healthcare_fhir_store.go
+++ b/google-beta/resource_healthcare_fhir_store.go
@@ -397,7 +397,6 @@ func resourceHealthcareFhirStoreUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -479,7 +478,6 @@ func resourceHealthcareFhirStoreDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_healthcare_hl7_v2_store.go b/google-beta/resource_healthcare_hl7_v2_store.go
index a654df2491..5a0ba5eb45 100644
--- a/google-beta/resource_healthcare_hl7_v2_store.go
+++ b/google-beta/resource_healthcare_hl7_v2_store.go
@@ -317,7 +317,6 @@ func resourceHealthcareHl7V2StoreUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -399,7 +398,6 @@ func resourceHealthcareHl7V2StoreDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_iam_audit_config.go b/google-beta/resource_iam_audit_config.go
index be0f3420ce..280c5be218 100644
--- a/google-beta/resource_iam_audit_config.go
+++ b/google-beta/resource_iam_audit_config.go
@@ -136,11 +136,6 @@ func iamAuditConfigImport(resourceIdParser resourceIdParserFunc) schema.StateFun
 func resourceIamAuditConfigCreateUpdate(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) func(*schema.ResourceData, interface{}) error {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -170,11 +165,7 @@ func resourceIamAuditConfigCreateUpdate(newUpdaterFunc newResourceIamUpdaterFunc
 func resourceIamAuditConfigDelete(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) schema.DeleteFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
+
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
 			return err
diff --git a/google-beta/resource_iam_binding.go b/google-beta/resource_iam_binding.go
index 35eb00882b..c8475c31c3 100644
--- a/google-beta/resource_iam_binding.go
+++ b/google-beta/resource_iam_binding.go
@@ -116,11 +116,7 @@ func resourceIamBindingCreateUpdate(newUpdaterFunc newResourceIamUpdaterFunc, en
 func resourceIamBindingRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.ReadFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
+
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
 			return err
@@ -254,11 +250,7 @@ func iamBindingImport(newUpdaterFunc newResourceIamUpdaterFunc, resourceIdParser
 func resourceIamBindingDelete(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) schema.DeleteFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
+
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
 			return err
diff --git a/google-beta/resource_iam_member.go b/google-beta/resource_iam_member.go
index 3bf4ecbf90..e6ec4de907 100644
--- a/google-beta/resource_iam_member.go
+++ b/google-beta/resource_iam_member.go
@@ -168,11 +168,6 @@ func getResourceIamMember(d *schema.ResourceData) *cloudresourcemanager.Binding
 func resourceIamMemberCreate(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) schema.CreateFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -206,11 +201,6 @@ func resourceIamMemberCreate(newUpdaterFunc newResourceIamUpdaterFunc, enableBat
 func resourceIamMemberRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.ReadFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -273,11 +263,6 @@ func resourceIamMemberRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.Read
 func resourceIamMemberDelete(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) schema.DeleteFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
diff --git a/google-beta/resource_iam_policy.go b/google-beta/resource_iam_policy.go
index 0fafa73ce7..a487743da1 100644
--- a/google-beta/resource_iam_policy.go
+++ b/google-beta/resource_iam_policy.go
@@ -54,11 +54,6 @@ func ResourceIamPolicy(parentSpecificSchema map[string]*schema.Schema, newUpdate
 func ResourceIamPolicyCreate(newUpdaterFunc newResourceIamUpdaterFunc) schema.CreateFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -77,11 +72,6 @@ func ResourceIamPolicyCreate(newUpdaterFunc newResourceIamUpdaterFunc) schema.Cr
 func ResourceIamPolicyRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.ReadFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -107,11 +97,6 @@ func ResourceIamPolicyRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.Read
 func ResourceIamPolicyUpdate(newUpdaterFunc newResourceIamUpdaterFunc) schema.UpdateFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -131,11 +116,6 @@ func ResourceIamPolicyUpdate(newUpdaterFunc newResourceIamUpdaterFunc) schema.Up
 func ResourceIamPolicyDelete(newUpdaterFunc newResourceIamUpdaterFunc) schema.DeleteFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
diff --git a/google-beta/resource_iap_brand.go b/google-beta/resource_iap_brand.go
index 9f17a0cca0..4e53cb5090 100644
--- a/google-beta/resource_iap_brand.go
+++ b/google-beta/resource_iap_brand.go
@@ -248,13 +248,6 @@ func resourceIapBrandRead(d *schema.ResourceData, meta interface{}) error {
 }
 
 func resourceIapBrandDelete(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*Config)
-	userAgent, err := generateUserAgentString(d, config.userAgent)
-	if err != nil {
-		return err
-	}
-	config.userAgent = userAgent
-
 	log.Printf("[WARNING] Iap Brand resources"+
 		" cannot be deleted from GCP. The resource %s will be removed from Terraform"+
 		" state, but will still be present on the server.", d.Id())
diff --git a/google-beta/resource_iap_client.go b/google-beta/resource_iap_client.go
index a1e1cf33f1..78188c9241 100644
--- a/google-beta/resource_iap_client.go
+++ b/google-beta/resource_iap_client.go
@@ -165,7 +165,6 @@ func resourceIapClientDelete(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_identity_platform_default_supported_idp_config.go b/google-beta/resource_identity_platform_default_supported_idp_config.go
index 9a576475ef..d9d98dbc4b 100644
--- a/google-beta/resource_identity_platform_default_supported_idp_config.go
+++ b/google-beta/resource_identity_platform_default_supported_idp_config.go
@@ -220,7 +220,6 @@ func resourceIdentityPlatformDefaultSupportedIdpConfigUpdate(d *schema.ResourceD
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -298,7 +297,6 @@ func resourceIdentityPlatformDefaultSupportedIdpConfigDelete(d *schema.ResourceD
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_identity_platform_inbound_saml_config.go b/google-beta/resource_identity_platform_inbound_saml_config.go
index 8682366bf8..82ef86727e 100644
--- a/google-beta/resource_identity_platform_inbound_saml_config.go
+++ b/google-beta/resource_identity_platform_inbound_saml_config.go
@@ -278,7 +278,6 @@ func resourceIdentityPlatformInboundSamlConfigUpdate(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -366,7 +365,6 @@ func resourceIdentityPlatformInboundSamlConfigDelete(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_identity_platform_oauth_idp_config.go b/google-beta/resource_identity_platform_oauth_idp_config.go
index 49990a1895..5abc7d2495 100644
--- a/google-beta/resource_identity_platform_oauth_idp_config.go
+++ b/google-beta/resource_identity_platform_oauth_idp_config.go
@@ -226,7 +226,6 @@ func resourceIdentityPlatformOauthIdpConfigUpdate(d *schema.ResourceData, meta i
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -324,7 +323,6 @@ func resourceIdentityPlatformOauthIdpConfigDelete(d *schema.ResourceData, meta i
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_identity_platform_tenant.go b/google-beta/resource_identity_platform_tenant.go
index 3567db2c0b..f9716ac568 100644
--- a/google-beta/resource_identity_platform_tenant.go
+++ b/google-beta/resource_identity_platform_tenant.go
@@ -225,7 +225,6 @@ func resourceIdentityPlatformTenantUpdate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -313,7 +312,6 @@ func resourceIdentityPlatformTenantDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_identity_platform_tenant_default_supported_idp_config.go b/google-beta/resource_identity_platform_tenant_default_supported_idp_config.go
index 4f199f2086..48c4b3bc55 100644
--- a/google-beta/resource_identity_platform_tenant_default_supported_idp_config.go
+++ b/google-beta/resource_identity_platform_tenant_default_supported_idp_config.go
@@ -226,7 +226,6 @@ func resourceIdentityPlatformTenantDefaultSupportedIdpConfigUpdate(d *schema.Res
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -304,7 +303,6 @@ func resourceIdentityPlatformTenantDefaultSupportedIdpConfigDelete(d *schema.Res
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_identity_platform_tenant_inbound_saml_config.go b/google-beta/resource_identity_platform_tenant_inbound_saml_config.go
index 27a26643f1..d0f1604ae4 100644
--- a/google-beta/resource_identity_platform_tenant_inbound_saml_config.go
+++ b/google-beta/resource_identity_platform_tenant_inbound_saml_config.go
@@ -284,7 +284,6 @@ func resourceIdentityPlatformTenantInboundSamlConfigUpdate(d *schema.ResourceDat
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -372,7 +371,6 @@ func resourceIdentityPlatformTenantInboundSamlConfigDelete(d *schema.ResourceDat
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_identity_platform_tenant_oauth_idp_config.go b/google-beta/resource_identity_platform_tenant_oauth_idp_config.go
index 12136aa5bc..94f9f3e92c 100644
--- a/google-beta/resource_identity_platform_tenant_oauth_idp_config.go
+++ b/google-beta/resource_identity_platform_tenant_oauth_idp_config.go
@@ -232,7 +232,6 @@ func resourceIdentityPlatformTenantOauthIdpConfigUpdate(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -330,7 +329,6 @@ func resourceIdentityPlatformTenantOauthIdpConfigDelete(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_kms_crypto_key.go b/google-beta/resource_kms_crypto_key.go
index 28e7b10daf..07d42c7698 100644
--- a/google-beta/resource_kms_crypto_key.go
+++ b/google-beta/resource_kms_crypto_key.go
@@ -260,7 +260,6 @@ func resourceKMSCryptoKeyUpdate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -341,7 +340,6 @@ func resourceKMSCryptoKeyDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	cryptoKeyId, err := parseKmsCryptoKeyId(d.Id(), config)
 	if err != nil {
diff --git a/google-beta/resource_kms_key_ring.go b/google-beta/resource_kms_key_ring.go
index 19d04d2cee..11dd952d9a 100644
--- a/google-beta/resource_kms_key_ring.go
+++ b/google-beta/resource_kms_key_ring.go
@@ -182,13 +182,6 @@ func resourceKMSKeyRingRead(d *schema.ResourceData, meta interface{}) error {
 }
 
 func resourceKMSKeyRingDelete(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*Config)
-	userAgent, err := generateUserAgentString(d, config.userAgent)
-	if err != nil {
-		return err
-	}
-	config.userAgent = userAgent
-
 	log.Printf("[WARNING] KMS KeyRing resources"+
 		" cannot be deleted from GCP. The resource %s will be removed from Terraform"+
 		" state, but will still be present on the server.", d.Id())
diff --git a/google-beta/resource_kms_key_ring_import_job.go b/google-beta/resource_kms_key_ring_import_job.go
index 731ccaf156..057f9bc303 100644
--- a/google-beta/resource_kms_key_ring_import_job.go
+++ b/google-beta/resource_kms_key_ring_import_job.go
@@ -236,7 +236,6 @@ func resourceKMSKeyRingImportJobDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_kms_secret_ciphertext.go b/google-beta/resource_kms_secret_ciphertext.go
index 6a87b13561..81a34d8725 100644
--- a/google-beta/resource_kms_secret_ciphertext.go
+++ b/google-beta/resource_kms_secret_ciphertext.go
@@ -181,13 +181,6 @@ func resourceKMSSecretCiphertextRead(d *schema.ResourceData, meta interface{}) e
 }
 
 func resourceKMSSecretCiphertextDelete(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*Config)
-	userAgent, err := generateUserAgentString(d, config.userAgent)
-	if err != nil {
-		return err
-	}
-	config.userAgent = userAgent
-
 	log.Printf("[WARNING] KMS SecretCiphertext resources"+
 		" cannot be deleted from GCP. The resource %s will be removed from Terraform"+
 		" state, but will still be present on the server.", d.Id())
diff --git a/google-beta/resource_logging_metric.go b/google-beta/resource_logging_metric.go
index f2e96177b7..6c27873c50 100644
--- a/google-beta/resource_logging_metric.go
+++ b/google-beta/resource_logging_metric.go
@@ -436,7 +436,6 @@ func resourceLoggingMetricUpdate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -526,7 +525,6 @@ func resourceLoggingMetricDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_memcache_instance.go b/google-beta/resource_memcache_instance.go
index 2f15d33ad3..f3a921ec95 100644
--- a/google-beta/resource_memcache_instance.go
+++ b/google-beta/resource_memcache_instance.go
@@ -403,7 +403,6 @@ func resourceMemcacheInstanceUpdate(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -499,7 +498,6 @@ func resourceMemcacheInstanceDelete(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_ml_engine_model.go b/google-beta/resource_ml_engine_model.go
index 7c2343beaa..00d52e99dd 100644
--- a/google-beta/resource_ml_engine_model.go
+++ b/google-beta/resource_ml_engine_model.go
@@ -261,7 +261,6 @@ func resourceMLEngineModelDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_monitoring_alert_policy.go b/google-beta/resource_monitoring_alert_policy.go
index ca6a0dea12..92df934f11 100644
--- a/google-beta/resource_monitoring_alert_policy.go
+++ b/google-beta/resource_monitoring_alert_policy.go
@@ -897,7 +897,6 @@ func resourceMonitoringAlertPolicyUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -1022,7 +1021,6 @@ func resourceMonitoringAlertPolicyDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_monitoring_group.go b/google-beta/resource_monitoring_group.go
index 08ce99e68c..4baad8c7ac 100644
--- a/google-beta/resource_monitoring_group.go
+++ b/google-beta/resource_monitoring_group.go
@@ -240,7 +240,6 @@ func resourceMonitoringGroupUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -312,7 +311,6 @@ func resourceMonitoringGroupDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_monitoring_metric_descriptor.go b/google-beta/resource_monitoring_metric_descriptor.go
index 2353b38e87..6a3c9540db 100644
--- a/google-beta/resource_monitoring_metric_descriptor.go
+++ b/google-beta/resource_monitoring_metric_descriptor.go
@@ -396,7 +396,6 @@ func resourceMonitoringMetricDescriptorUpdate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -496,7 +495,6 @@ func resourceMonitoringMetricDescriptorDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_monitoring_notification_channel.go b/google-beta/resource_monitoring_notification_channel.go
index b9b4ae3c69..935eb6f81b 100644
--- a/google-beta/resource_monitoring_notification_channel.go
+++ b/google-beta/resource_monitoring_notification_channel.go
@@ -349,7 +349,6 @@ func resourceMonitoringNotificationChannelUpdate(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -438,7 +437,6 @@ func resourceMonitoringNotificationChannelDelete(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_monitoring_service.go b/google-beta/resource_monitoring_service.go
index 5fb441ec9a..46bc84b8ad 100644
--- a/google-beta/resource_monitoring_service.go
+++ b/google-beta/resource_monitoring_service.go
@@ -216,7 +216,6 @@ func resourceMonitoringServiceUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -289,7 +288,6 @@ func resourceMonitoringServiceDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_monitoring_slo.go b/google-beta/resource_monitoring_slo.go
index ac055d72e9..3e1cf9816b 100644
--- a/google-beta/resource_monitoring_slo.go
+++ b/google-beta/resource_monitoring_slo.go
@@ -859,7 +859,6 @@ func resourceMonitoringSloUpdate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -993,7 +992,6 @@ func resourceMonitoringSloDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_monitoring_uptime_check_config.go b/google-beta/resource_monitoring_uptime_check_config.go
index 8716c05c17..eb5e8002b6 100644
--- a/google-beta/resource_monitoring_uptime_check_config.go
+++ b/google-beta/resource_monitoring_uptime_check_config.go
@@ -474,7 +474,6 @@ func resourceMonitoringUptimeCheckConfigUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -589,7 +588,6 @@ func resourceMonitoringUptimeCheckConfigDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_network_management_connectivity_test_resource.go b/google-beta/resource_network_management_connectivity_test_resource.go
index d46944339b..ecc3fd165d 100644
--- a/google-beta/resource_network_management_connectivity_test_resource.go
+++ b/google-beta/resource_network_management_connectivity_test_resource.go
@@ -400,7 +400,6 @@ func resourceNetworkManagementConnectivityTestUpdate(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -525,7 +524,6 @@ func resourceNetworkManagementConnectivityTestDelete(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_notebooks_environment.go b/google-beta/resource_notebooks_environment.go
index e4b7ba7b3e..52042628d8 100644
--- a/google-beta/resource_notebooks_environment.go
+++ b/google-beta/resource_notebooks_environment.go
@@ -290,7 +290,6 @@ func resourceNotebooksEnvironmentUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -369,7 +368,6 @@ func resourceNotebooksEnvironmentDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_notebooks_instance.go b/google-beta/resource_notebooks_instance.go
index 278b58a121..700c46822e 100644
--- a/google-beta/resource_notebooks_instance.go
+++ b/google-beta/resource_notebooks_instance.go
@@ -619,7 +619,6 @@ func resourceNotebooksInstanceUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -677,7 +676,6 @@ func resourceNotebooksInstanceDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_notebooks_location.go b/google-beta/resource_notebooks_location.go
index b2c4671454..53055836de 100644
--- a/google-beta/resource_notebooks_location.go
+++ b/google-beta/resource_notebooks_location.go
@@ -184,7 +184,6 @@ func resourceNotebooksLocationUpdate(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -239,7 +238,6 @@ func resourceNotebooksLocationDelete(d *schema.ResourceData, meta interface{}) e
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_os_config_guest_policies.go b/google-beta/resource_os_config_guest_policies.go
index 3ab929fcaf..7410b4fd44 100644
--- a/google-beta/resource_os_config_guest_policies.go
+++ b/google-beta/resource_os_config_guest_policies.go
@@ -1047,7 +1047,6 @@ func resourceOSConfigGuestPoliciesUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -1124,7 +1123,6 @@ func resourceOSConfigGuestPoliciesDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_os_config_patch_deployment.go b/google-beta/resource_os_config_patch_deployment.go
index b7b3579d8f..1b2ac81bc0 100644
--- a/google-beta/resource_os_config_patch_deployment.go
+++ b/google-beta/resource_os_config_patch_deployment.go
@@ -1138,7 +1138,6 @@ func resourceOSConfigPatchDeploymentDelete(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_os_login_ssh_public_key.go b/google-beta/resource_os_login_ssh_public_key.go
index ec194eac90..ea3356ca42 100644
--- a/google-beta/resource_os_login_ssh_public_key.go
+++ b/google-beta/resource_os_login_ssh_public_key.go
@@ -199,7 +199,6 @@ func resourceOSLoginSSHPublicKeyUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -251,7 +250,6 @@ func resourceOSLoginSSHPublicKeyDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_pubsub_subscription.go b/google-beta/resource_pubsub_subscription.go
index 6d2508020d..2dd4c52f1d 100644
--- a/google-beta/resource_pubsub_subscription.go
+++ b/google-beta/resource_pubsub_subscription.go
@@ -595,7 +595,6 @@ func resourcePubsubSubscriptionUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -738,7 +737,6 @@ func resourcePubsubSubscriptionDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_pubsub_topic.go b/google-beta/resource_pubsub_topic.go
index 49761ea0a2..59918527fb 100644
--- a/google-beta/resource_pubsub_topic.go
+++ b/google-beta/resource_pubsub_topic.go
@@ -271,7 +271,6 @@ func resourcePubsubTopicUpdate(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -344,7 +343,6 @@ func resourcePubsubTopicDelete(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_redis_instance.go b/google-beta/resource_redis_instance.go
index 666e3b5025..c88a0d2e83 100644
--- a/google-beta/resource_redis_instance.go
+++ b/google-beta/resource_redis_instance.go
@@ -464,7 +464,6 @@ func resourceRedisInstanceUpdate(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -575,7 +574,6 @@ func resourceRedisInstanceDelete(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_resource_manager_lien.go b/google-beta/resource_resource_manager_lien.go
index 58dfecd16f..e63e794f7b 100644
--- a/google-beta/resource_resource_manager_lien.go
+++ b/google-beta/resource_resource_manager_lien.go
@@ -246,7 +246,6 @@ func resourceResourceManagerLienDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_secret_manager_secret.go b/google-beta/resource_secret_manager_secret.go
index 713fa7b5f5..177a34d8f7 100644
--- a/google-beta/resource_secret_manager_secret.go
+++ b/google-beta/resource_secret_manager_secret.go
@@ -246,7 +246,6 @@ func resourceSecretManagerSecretUpdate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -304,7 +303,6 @@ func resourceSecretManagerSecretDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_secret_manager_secret_version.go b/google-beta/resource_secret_manager_secret_version.go
index 062585c676..89ae3e2848 100644
--- a/google-beta/resource_secret_manager_secret_version.go
+++ b/google-beta/resource_secret_manager_secret_version.go
@@ -227,7 +227,6 @@ func resourceSecretManagerSecretVersionDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_security_center_source.go b/google-beta/resource_security_center_source.go
index 6fefb10b0b..715b0714e1 100644
--- a/google-beta/resource_security_center_source.go
+++ b/google-beta/resource_security_center_source.go
@@ -191,7 +191,6 @@ func resourceSecurityCenterSourceUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -248,13 +247,6 @@ func resourceSecurityCenterSourceUpdate(d *schema.ResourceData, meta interface{}
 }
 
 func resourceSecurityCenterSourceDelete(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*Config)
-	userAgent, err := generateUserAgentString(d, config.userAgent)
-	if err != nil {
-		return err
-	}
-	config.userAgent = userAgent
-
 	log.Printf("[WARNING] SecurityCenter Source resources"+
 		" cannot be deleted from GCP. The resource %s will be removed from Terraform"+
 		" state, but will still be present on the server.", d.Id())
diff --git a/google-beta/resource_security_scanner_scan_config.go b/google-beta/resource_security_scanner_scan_config.go
index e9e07728e7..05f6fc8796 100644
--- a/google-beta/resource_security_scanner_scan_config.go
+++ b/google-beta/resource_security_scanner_scan_config.go
@@ -393,7 +393,6 @@ func resourceSecurityScannerScanConfigUpdate(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -531,7 +530,6 @@ func resourceSecurityScannerScanConfigDelete(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_service_directory_endpoint.go b/google-beta/resource_service_directory_endpoint.go
index ba1d415d15..eae027a422 100644
--- a/google-beta/resource_service_directory_endpoint.go
+++ b/google-beta/resource_service_directory_endpoint.go
@@ -195,7 +195,6 @@ func resourceServiceDirectoryEndpointUpdate(d *schema.ResourceData, meta interfa
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -267,7 +266,6 @@ func resourceServiceDirectoryEndpointDelete(d *schema.ResourceData, meta interfa
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_service_directory_namespace.go b/google-beta/resource_service_directory_namespace.go
index 4be8ff8608..2c3c8011f7 100644
--- a/google-beta/resource_service_directory_namespace.go
+++ b/google-beta/resource_service_directory_namespace.go
@@ -185,7 +185,6 @@ func resourceServiceDirectoryNamespaceUpdate(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -243,7 +242,6 @@ func resourceServiceDirectoryNamespaceDelete(d *schema.ResourceData, meta interf
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_service_directory_service.go b/google-beta/resource_service_directory_service.go
index 0764ac08c6..aceb420286 100644
--- a/google-beta/resource_service_directory_service.go
+++ b/google-beta/resource_service_directory_service.go
@@ -162,7 +162,6 @@ func resourceServiceDirectoryServiceUpdate(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -214,7 +213,6 @@ func resourceServiceDirectoryServiceDelete(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_service_usage_consumer_quota_override.go b/google-beta/resource_service_usage_consumer_quota_override.go
index 6537dbac7d..a85c83723a 100644
--- a/google-beta/resource_service_usage_consumer_quota_override.go
+++ b/google-beta/resource_service_usage_consumer_quota_override.go
@@ -248,7 +248,6 @@ func resourceServiceUsageConsumerQuotaOverrideUpdate(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -303,7 +302,6 @@ func resourceServiceUsageConsumerQuotaOverrideDelete(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_source_repo_repository.go b/google-beta/resource_source_repo_repository.go
index 1cc5421315..9a44a41aab 100644
--- a/google-beta/resource_source_repo_repository.go
+++ b/google-beta/resource_source_repo_repository.go
@@ -240,7 +240,6 @@ func resourceSourceRepoRepositoryUpdate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -303,7 +302,6 @@ func resourceSourceRepoRepositoryDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_spanner_database.go b/google-beta/resource_spanner_database.go
index fa9993aaf1..4ff0bb6d59 100644
--- a/google-beta/resource_spanner_database.go
+++ b/google-beta/resource_spanner_database.go
@@ -293,7 +293,6 @@ func resourceSpannerDatabaseUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -356,7 +355,6 @@ func resourceSpannerDatabaseDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_spanner_instance.go b/google-beta/resource_spanner_instance.go
index 48acf5a03c..5011b025c0 100644
--- a/google-beta/resource_spanner_instance.go
+++ b/google-beta/resource_spanner_instance.go
@@ -293,7 +293,6 @@ func resourceSpannerInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -371,7 +370,6 @@ func resourceSpannerInstanceDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_sql_database.go b/google-beta/resource_sql_database.go
index afc4c0ceea..2a002cd626 100644
--- a/google-beta/resource_sql_database.go
+++ b/google-beta/resource_sql_database.go
@@ -234,7 +234,6 @@ func resourceSQLDatabaseUpdate(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -314,7 +313,6 @@ func resourceSQLDatabaseDelete(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_sql_source_representation_instance.go b/google-beta/resource_sql_source_representation_instance.go
index d4c4a6698a..ab4964d303 100644
--- a/google-beta/resource_sql_source_representation_instance.go
+++ b/google-beta/resource_sql_source_representation_instance.go
@@ -255,7 +255,6 @@ func resourceSQLSourceRepresentationInstanceDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_storage_bucket_access_control.go b/google-beta/resource_storage_bucket_access_control.go
index 166221a293..47b759096f 100644
--- a/google-beta/resource_storage_bucket_access_control.go
+++ b/google-beta/resource_storage_bucket_access_control.go
@@ -202,7 +202,6 @@ func resourceStorageBucketAccessControlUpdate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -262,7 +261,6 @@ func resourceStorageBucketAccessControlDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_storage_default_object_access_control.go b/google-beta/resource_storage_default_object_access_control.go
index 413349f362..34a950ee1b 100644
--- a/google-beta/resource_storage_default_object_access_control.go
+++ b/google-beta/resource_storage_default_object_access_control.go
@@ -245,7 +245,6 @@ func resourceStorageDefaultObjectAccessControlUpdate(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -311,7 +310,6 @@ func resourceStorageDefaultObjectAccessControlDelete(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_storage_hmac_key.go b/google-beta/resource_storage_hmac_key.go
index f33a2f62f7..edd7d81c26 100644
--- a/google-beta/resource_storage_hmac_key.go
+++ b/google-beta/resource_storage_hmac_key.go
@@ -242,7 +242,6 @@ func resourceStorageHmacKeyUpdate(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -311,7 +310,6 @@ func resourceStorageHmacKeyDelete(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_storage_object_access_control.go b/google-beta/resource_storage_object_access_control.go
index 2959a701f4..d7b1102407 100644
--- a/google-beta/resource_storage_object_access_control.go
+++ b/google-beta/resource_storage_object_access_control.go
@@ -248,7 +248,6 @@ func resourceStorageObjectAccessControlUpdate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -314,7 +313,6 @@ func resourceStorageObjectAccessControlDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_tpu_node.go b/google-beta/resource_tpu_node.go
index 42569507d8..50553a908a 100644
--- a/google-beta/resource_tpu_node.go
+++ b/google-beta/resource_tpu_node.go
@@ -424,7 +424,6 @@ func resourceTPUNodeUpdate(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -482,7 +481,6 @@ func resourceTPUNodeDelete(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/resource_vpc_access_connector.go b/google-beta/resource_vpc_access_connector.go
index edf84259b5..e93e42889c 100644
--- a/google-beta/resource_vpc_access_connector.go
+++ b/google-beta/resource_vpc_access_connector.go
@@ -291,7 +291,6 @@ func resourceVPCAccessConnectorDelete(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
diff --git a/google-beta/utils.go b/google-beta/utils.go
index f812bc8d92..034a65daec 100644
--- a/google-beta/utils.go
+++ b/google-beta/utils.go
@@ -457,5 +457,9 @@ func generateUserAgentString(d *schema.ResourceData, currentUserAgent string) (s
 		return currentUserAgent, err
 	}
 
-	return strings.Join([]string{currentUserAgent, m.ModuleName}, " "), nil
+	if m.ModuleName != "" {
+		return strings.Join([]string{currentUserAgent, m.ModuleName}, " "), nil
+	}
+
+	return currentUserAgent, nil
 }