diff --git a/sdk/resourcemanager/attestation/armattestation/CHANGELOG.md b/sdk/resourcemanager/attestation/armattestation/CHANGELOG.md
index 77b8c8df2170..902217a8d639 100644
--- a/sdk/resourcemanager/attestation/armattestation/CHANGELOG.md
+++ b/sdk/resourcemanager/attestation/armattestation/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.2.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.2.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/attestation/armattestation/autorest.md b/sdk/resourcemanager/attestation/armattestation/autorest.md
index 2a2f0f11284c..3f5126b00b64 100644
--- a/sdk/resourcemanager/attestation/armattestation/autorest.md
+++ b/sdk/resourcemanager/attestation/armattestation/autorest.md
@@ -8,5 +8,5 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/attestation/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/attestation/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.2.0
+module-version: 0.2.1
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/attestation/armattestation/go.mod b/sdk/resourcemanager/attestation/armattestation/go.mod
index 84029921d88b..d84f8bfff97c 100644
--- a/sdk/resourcemanager/attestation/armattestation/go.mod
+++ b/sdk/resourcemanager/attestation/armattestation/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/attestation/armatte
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/attestation/armattestation/go.sum b/sdk/resourcemanager/attestation/armattestation/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/attestation/armattestation/go.sum
+++ b/sdk/resourcemanager/attestation/armattestation/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/attestation/armattestation/go_mod_tidy_hack.go b/sdk/resourcemanager/attestation/armattestation/go_mod_tidy_hack.go
deleted file mode 100644
index c008ba1f840c..000000000000
--- a/sdk/resourcemanager/attestation/armattestation/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armattestation
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/attestation/armattestation/zz_generated_constants.go b/sdk/resourcemanager/attestation/armattestation/zz_generated_constants.go
index 215796c4ed1a..7eb79c919512 100644
--- a/sdk/resourcemanager/attestation/armattestation/zz_generated_constants.go
+++ b/sdk/resourcemanager/attestation/armattestation/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armattestation
 
 const (
 	moduleName    = "armattestation"
-	moduleVersion = "v0.2.0"
+	moduleVersion = "v0.2.1"
 )
 
 // AttestationServiceStatus - Status of attestation service.
diff --git a/sdk/resourcemanager/authorization/armauthorization/CHANGELOG.md b/sdk/resourcemanager/authorization/armauthorization/CHANGELOG.md
index ef70f7abfda0..d604fcdcd763 100644
--- a/sdk/resourcemanager/authorization/armauthorization/CHANGELOG.md
+++ b/sdk/resourcemanager/authorization/armauthorization/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.3.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.3.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/authorization/armauthorization/autorest.md b/sdk/resourcemanager/authorization/armauthorization/autorest.md
index f646228b11ef..dff5a3edd04a 100644
--- a/sdk/resourcemanager/authorization/armauthorization/autorest.md
+++ b/sdk/resourcemanager/authorization/armauthorization/autorest.md
@@ -8,5 +8,5 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/authorization/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/authorization/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.3.0
+module-version: 0.3.1
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/authorization/armauthorization/go.mod b/sdk/resourcemanager/authorization/armauthorization/go.mod
index 3f5a211277c1..80e725bf1aa6 100644
--- a/sdk/resourcemanager/authorization/armauthorization/go.mod
+++ b/sdk/resourcemanager/authorization/armauthorization/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armau
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/authorization/armauthorization/go.sum b/sdk/resourcemanager/authorization/armauthorization/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/authorization/armauthorization/go.sum
+++ b/sdk/resourcemanager/authorization/armauthorization/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/authorization/armauthorization/go_mod_tidy_hack.go b/sdk/resourcemanager/authorization/armauthorization/go_mod_tidy_hack.go
deleted file mode 100644
index 4547f7833a52..000000000000
--- a/sdk/resourcemanager/authorization/armauthorization/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armauthorization
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/authorization/armauthorization/zz_generated_constants.go b/sdk/resourcemanager/authorization/armauthorization/zz_generated_constants.go
index 6fb90e5defbd..3fe0831bf9c9 100644
--- a/sdk/resourcemanager/authorization/armauthorization/zz_generated_constants.go
+++ b/sdk/resourcemanager/authorization/armauthorization/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armauthorization
 
 const (
 	moduleName    = "armauthorization"
-	moduleVersion = "v0.3.0"
+	moduleVersion = "v0.3.1"
 )
 
 // AccessRecommendationType - The feature- generated recommendation shown to the reviewer.
diff --git a/sdk/resourcemanager/automanage/armautomanage/CHANGELOG.md b/sdk/resourcemanager/automanage/armautomanage/CHANGELOG.md
index f5fb4228aa6f..094c1c2760fb 100644
--- a/sdk/resourcemanager/automanage/armautomanage/CHANGELOG.md
+++ b/sdk/resourcemanager/automanage/armautomanage/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.2.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.2.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/automanage/armautomanage/autorest.md b/sdk/resourcemanager/automanage/armautomanage/autorest.md
index cda9f875feea..3d8994b7fea0 100644
--- a/sdk/resourcemanager/automanage/armautomanage/autorest.md
+++ b/sdk/resourcemanager/automanage/armautomanage/autorest.md
@@ -8,5 +8,5 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/automanage/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/automanage/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.2.0
+module-version: 0.2.1
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/automanage/armautomanage/go.mod b/sdk/resourcemanager/automanage/armautomanage/go.mod
index 82dee3c6d8ef..c14fdeca4e82 100644
--- a/sdk/resourcemanager/automanage/armautomanage/go.mod
+++ b/sdk/resourcemanager/automanage/armautomanage/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/automanage/armautom
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/automanage/armautomanage/go.sum b/sdk/resourcemanager/automanage/armautomanage/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/automanage/armautomanage/go.sum
+++ b/sdk/resourcemanager/automanage/armautomanage/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/automanage/armautomanage/go_mod_tidy_hack.go b/sdk/resourcemanager/automanage/armautomanage/go_mod_tidy_hack.go
deleted file mode 100644
index 59a3839e12e4..000000000000
--- a/sdk/resourcemanager/automanage/armautomanage/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armautomanage
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/automanage/armautomanage/zz_generated_constants.go b/sdk/resourcemanager/automanage/armautomanage/zz_generated_constants.go
index 5f148a7072a7..545387c7aa7f 100644
--- a/sdk/resourcemanager/automanage/armautomanage/zz_generated_constants.go
+++ b/sdk/resourcemanager/automanage/armautomanage/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armautomanage
 
 const (
 	moduleName    = "armautomanage"
-	moduleVersion = "v0.2.0"
+	moduleVersion = "v0.2.1"
 )
 
 // ActionType - Enum. Indicates the action type. "Internal" refers to actions that are for internal only APIs.
diff --git a/sdk/resourcemanager/automation/armautomation/CHANGELOG.md b/sdk/resourcemanager/automation/armautomation/CHANGELOG.md
index 129e5b6a9854..afbc9cc969d9 100644
--- a/sdk/resourcemanager/automation/armautomation/CHANGELOG.md
+++ b/sdk/resourcemanager/automation/armautomation/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.3.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.3.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/automation/armautomation/autorest.md b/sdk/resourcemanager/automation/armautomation/autorest.md
index c4e4548bf449..70726b4b9d08 100644
--- a/sdk/resourcemanager/automation/armautomation/autorest.md
+++ b/sdk/resourcemanager/automation/armautomation/autorest.md
@@ -8,5 +8,5 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/automation/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/automation/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.3.0
+module-version: 0.3.1
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/automation/armautomation/go.mod b/sdk/resourcemanager/automation/armautomation/go.mod
index 4be943c63f3b..d94635868d79 100644
--- a/sdk/resourcemanager/automation/armautomation/go.mod
+++ b/sdk/resourcemanager/automation/armautomation/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/automation/armautom
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/automation/armautomation/go.sum b/sdk/resourcemanager/automation/armautomation/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/automation/armautomation/go.sum
+++ b/sdk/resourcemanager/automation/armautomation/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/automation/armautomation/go_mod_tidy_hack.go b/sdk/resourcemanager/automation/armautomation/go_mod_tidy_hack.go
deleted file mode 100644
index 9a19c98c152a..000000000000
--- a/sdk/resourcemanager/automation/armautomation/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armautomation
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/automation/armautomation/zz_generated_constants.go b/sdk/resourcemanager/automation/armautomation/zz_generated_constants.go
index 9552af81a822..d783a6926f85 100644
--- a/sdk/resourcemanager/automation/armautomation/zz_generated_constants.go
+++ b/sdk/resourcemanager/automation/armautomation/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armautomation
 
 const (
 	moduleName    = "armautomation"
-	moduleVersion = "v0.3.0"
+	moduleVersion = "v0.3.1"
 )
 
 // AgentRegistrationKeyName - Gets or sets the agent registration key name - primary or secondary.
diff --git a/sdk/resourcemanager/avs/armavs/CHANGELOG.md b/sdk/resourcemanager/avs/armavs/CHANGELOG.md
index 32a88c778787..71710c169849 100644
--- a/sdk/resourcemanager/avs/armavs/CHANGELOG.md
+++ b/sdk/resourcemanager/avs/armavs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.2.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.2.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/avs/armavs/autorest.md b/sdk/resourcemanager/avs/armavs/autorest.md
index a7cf4d3eea36..07ed5dde77a4 100644
--- a/sdk/resourcemanager/avs/armavs/autorest.md
+++ b/sdk/resourcemanager/avs/armavs/autorest.md
@@ -8,5 +8,5 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/vmware/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/vmware/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.2.0
+module-version: 0.2.1
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/avs/armavs/go.mod b/sdk/resourcemanager/avs/armavs/go.mod
index 14dd7afc0554..376deb470a84 100644
--- a/sdk/resourcemanager/avs/armavs/go.mod
+++ b/sdk/resourcemanager/avs/armavs/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/avs/armavs
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/avs/armavs/go.sum b/sdk/resourcemanager/avs/armavs/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/avs/armavs/go.sum
+++ b/sdk/resourcemanager/avs/armavs/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/avs/armavs/go_mod_tidy_hack.go b/sdk/resourcemanager/avs/armavs/go_mod_tidy_hack.go
deleted file mode 100644
index 518900867934..000000000000
--- a/sdk/resourcemanager/avs/armavs/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armavs
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/avs/armavs/zz_generated_constants.go b/sdk/resourcemanager/avs/armavs/zz_generated_constants.go
index 41832d07fbbd..7799f6b16d58 100644
--- a/sdk/resourcemanager/avs/armavs/zz_generated_constants.go
+++ b/sdk/resourcemanager/avs/armavs/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armavs
 
 const (
 	moduleName    = "armavs"
-	moduleVersion = "v0.2.0"
+	moduleVersion = "v0.2.1"
 )
 
 // AddonProvisioningState - The state of the addon provisioning
diff --git a/sdk/resourcemanager/azurearcdata/armazurearcdata/CHANGELOG.md b/sdk/resourcemanager/azurearcdata/armazurearcdata/CHANGELOG.md
index b9ad3ad43fe3..fa05a8a2c3ec 100644
--- a/sdk/resourcemanager/azurearcdata/armazurearcdata/CHANGELOG.md
+++ b/sdk/resourcemanager/azurearcdata/armazurearcdata/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.2.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.2.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/azurearcdata/armazurearcdata/autorest.md b/sdk/resourcemanager/azurearcdata/armazurearcdata/autorest.md
index 193ebe68311c..29c4a8ae2bc5 100644
--- a/sdk/resourcemanager/azurearcdata/armazurearcdata/autorest.md
+++ b/sdk/resourcemanager/azurearcdata/armazurearcdata/autorest.md
@@ -8,6 +8,6 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/azurearcdata/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/azurearcdata/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.2.0
+module-version: 0.2.1
 
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/azurearcdata/armazurearcdata/go.mod b/sdk/resourcemanager/azurearcdata/armazurearcdata/go.mod
index a1a5d405abcd..8ca3a51888cf 100644
--- a/sdk/resourcemanager/azurearcdata/armazurearcdata/go.mod
+++ b/sdk/resourcemanager/azurearcdata/armazurearcdata/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/azurearcdata/armazu
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/azurearcdata/armazurearcdata/go.sum b/sdk/resourcemanager/azurearcdata/armazurearcdata/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/azurearcdata/armazurearcdata/go.sum
+++ b/sdk/resourcemanager/azurearcdata/armazurearcdata/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/azurearcdata/armazurearcdata/go_mod_tidy_hack.go b/sdk/resourcemanager/azurearcdata/armazurearcdata/go_mod_tidy_hack.go
deleted file mode 100644
index e808afb0b8ca..000000000000
--- a/sdk/resourcemanager/azurearcdata/armazurearcdata/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armazurearcdata
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/azurearcdata/armazurearcdata/zz_generated_constants.go b/sdk/resourcemanager/azurearcdata/armazurearcdata/zz_generated_constants.go
index 93d28a151b1d..fd5ed8f60f04 100644
--- a/sdk/resourcemanager/azurearcdata/armazurearcdata/zz_generated_constants.go
+++ b/sdk/resourcemanager/azurearcdata/armazurearcdata/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armazurearcdata
 
 const (
 	moduleName    = "armazurearcdata"
-	moduleVersion = "v0.2.0"
+	moduleVersion = "v0.2.1"
 )
 
 // ArcSQLManagedInstanceLicenseType - The license type to apply for this managed instance.
diff --git a/sdk/resourcemanager/azuredata/armazuredata/CHANGELOG.md b/sdk/resourcemanager/azuredata/armazuredata/CHANGELOG.md
index bbc9d7a9727f..ce0565e8dcf0 100644
--- a/sdk/resourcemanager/azuredata/armazuredata/CHANGELOG.md
+++ b/sdk/resourcemanager/azuredata/armazuredata/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.2.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.2.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/azuredata/armazuredata/autorest.md b/sdk/resourcemanager/azuredata/armazuredata/autorest.md
index 2c585171e73f..91e5488b87a7 100644
--- a/sdk/resourcemanager/azuredata/armazuredata/autorest.md
+++ b/sdk/resourcemanager/azuredata/armazuredata/autorest.md
@@ -8,6 +8,6 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/azuredata/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/azuredata/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.2.0
+module-version: 0.2.1
 
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/azuredata/armazuredata/go.mod b/sdk/resourcemanager/azuredata/armazuredata/go.mod
index 8231c88ea803..eae172fce79c 100644
--- a/sdk/resourcemanager/azuredata/armazuredata/go.mod
+++ b/sdk/resourcemanager/azuredata/armazuredata/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/azuredata/armazured
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/azuredata/armazuredata/go.sum b/sdk/resourcemanager/azuredata/armazuredata/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/azuredata/armazuredata/go.sum
+++ b/sdk/resourcemanager/azuredata/armazuredata/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/azuredata/armazuredata/go_mod_tidy_hack.go b/sdk/resourcemanager/azuredata/armazuredata/go_mod_tidy_hack.go
deleted file mode 100644
index d87603f962cc..000000000000
--- a/sdk/resourcemanager/azuredata/armazuredata/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armazuredata
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/azuredata/armazuredata/zz_generated_constants.go b/sdk/resourcemanager/azuredata/armazuredata/zz_generated_constants.go
index e950500caf12..ebcc5bcc96ff 100644
--- a/sdk/resourcemanager/azuredata/armazuredata/zz_generated_constants.go
+++ b/sdk/resourcemanager/azuredata/armazuredata/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armazuredata
 
 const (
 	moduleName    = "armazuredata"
-	moduleVersion = "v0.2.0"
+	moduleVersion = "v0.2.1"
 )
 
 // IdentityType - The type of identity that creates/modifies resources
diff --git a/sdk/resourcemanager/azurestackhci/armazurestackhci/CHANGELOG.md b/sdk/resourcemanager/azurestackhci/armazurestackhci/CHANGELOG.md
index f76b58ac319c..89faf5f358c6 100644
--- a/sdk/resourcemanager/azurestackhci/armazurestackhci/CHANGELOG.md
+++ b/sdk/resourcemanager/azurestackhci/armazurestackhci/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.2.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.2.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/azurestackhci/armazurestackhci/autorest.md b/sdk/resourcemanager/azurestackhci/armazurestackhci/autorest.md
index 75d91ebf0b2e..2ef1e2ad6686 100644
--- a/sdk/resourcemanager/azurestackhci/armazurestackhci/autorest.md
+++ b/sdk/resourcemanager/azurestackhci/armazurestackhci/autorest.md
@@ -8,6 +8,6 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/azurestackhci/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/azurestackhci/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.2.0
+module-version: 0.2.1
 
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/azurestackhci/armazurestackhci/go.mod b/sdk/resourcemanager/azurestackhci/armazurestackhci/go.mod
index bede75d276d3..991467512dae 100644
--- a/sdk/resourcemanager/azurestackhci/armazurestackhci/go.mod
+++ b/sdk/resourcemanager/azurestackhci/armazurestackhci/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/azurestackhci/armaz
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/azurestackhci/armazurestackhci/go.sum b/sdk/resourcemanager/azurestackhci/armazurestackhci/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/azurestackhci/armazurestackhci/go.sum
+++ b/sdk/resourcemanager/azurestackhci/armazurestackhci/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/azurestackhci/armazurestackhci/go_mod_tidy_hack.go b/sdk/resourcemanager/azurestackhci/armazurestackhci/go_mod_tidy_hack.go
deleted file mode 100644
index 1e750eda29bc..000000000000
--- a/sdk/resourcemanager/azurestackhci/armazurestackhci/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armazurestackhci
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/azurestackhci/armazurestackhci/zz_generated_constants.go b/sdk/resourcemanager/azurestackhci/armazurestackhci/zz_generated_constants.go
index 3e441700d1a1..bfb30ef9750f 100644
--- a/sdk/resourcemanager/azurestackhci/armazurestackhci/zz_generated_constants.go
+++ b/sdk/resourcemanager/azurestackhci/armazurestackhci/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armazurestackhci
 
 const (
 	moduleName    = "armazurestackhci"
-	moduleVersion = "v0.2.0"
+	moduleVersion = "v0.2.1"
 )
 
 // ActionType - Enum. Indicates the action type. "Internal" refers to actions that are for internal only APIs.
diff --git a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/CHANGELOG.md b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/CHANGELOG.md
index ab7cb38828cc..27cc7c0d22e3 100644
--- a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/CHANGELOG.md
+++ b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.2.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.2.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/autorest.md b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/autorest.md
index f3d08b0e6cc8..49eb20035511 100644
--- a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/autorest.md
+++ b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/autorest.md
@@ -8,6 +8,6 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/baremetalinfrastructure/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/baremetalinfrastructure/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.2.0
+module-version: 0.2.1
 
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go.mod b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go.mod
index 668511c046ec..4f280c4cba69 100644
--- a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go.mod
+++ b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/baremetalinfrastruc
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go.sum b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go.sum
+++ b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go_mod_tidy_hack.go b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go_mod_tidy_hack.go
deleted file mode 100644
index ca1991d4a1d7..000000000000
--- a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armbaremetalinfrastructure
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/zz_generated_constants.go b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/zz_generated_constants.go
index 0cd14ace757b..4a049d628665 100644
--- a/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/zz_generated_constants.go
+++ b/sdk/resourcemanager/baremetalinfrastructure/armbaremetalinfrastructure/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armbaremetalinfrastructure
 
 const (
 	moduleName    = "armbaremetalinfrastructure"
-	moduleVersion = "v0.2.0"
+	moduleVersion = "v0.2.1"
 )
 
 // AzureBareMetalHardwareTypeNamesEnum - Name of the hardware type (vendor and/or their product name)
diff --git a/sdk/resourcemanager/batch/armbatch/CHANGELOG.md b/sdk/resourcemanager/batch/armbatch/CHANGELOG.md
index 9ef297736248..5cee00b0468c 100644
--- a/sdk/resourcemanager/batch/armbatch/CHANGELOG.md
+++ b/sdk/resourcemanager/batch/armbatch/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.2.1 (2022-02-22)
+
+### Other Changes
+
+- Remove the go_mod_tidy_hack.go file.
+
 ## 0.2.0 (2022-01-13)
 ### Breaking Changes
 
diff --git a/sdk/resourcemanager/batch/armbatch/autorest.md b/sdk/resourcemanager/batch/armbatch/autorest.md
index 80adce052e7e..cd6635dea673 100644
--- a/sdk/resourcemanager/batch/armbatch/autorest.md
+++ b/sdk/resourcemanager/batch/armbatch/autorest.md
@@ -8,5 +8,5 @@ require:
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/batch/resource-manager/readme.md
 - https://github.com/Azure/azure-rest-api-specs/blob/8e4746332979ed6ff3577bdc97dd2065a7577598/specification/batch/resource-manager/readme.go.md
 license-header: MICROSOFT_MIT_NO_VERSION
-module-version: 0.2.0
+module-version: 0.2.1
 ```
\ No newline at end of file
diff --git a/sdk/resourcemanager/batch/armbatch/go.mod b/sdk/resourcemanager/batch/armbatch/go.mod
index 577b4ef1d7d3..9095d05c3235 100644
--- a/sdk/resourcemanager/batch/armbatch/go.mod
+++ b/sdk/resourcemanager/batch/armbatch/go.mod
@@ -3,7 +3,6 @@ module github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/batch/armbatch
 go 1.16
 
 require (
-	github.com/Azure/azure-sdk-for-go v61.1.0+incompatible
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0
 )
diff --git a/sdk/resourcemanager/batch/armbatch/go.sum b/sdk/resourcemanager/batch/armbatch/go.sum
index 993764ff59dc..2ce51d3b8174 100644
--- a/sdk/resourcemanager/batch/armbatch/go.sum
+++ b/sdk/resourcemanager/batch/armbatch/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible h1:Qbz3jdfkXIPjZECEuk2E7i3iLhC9Ul74pG5mQRQC+z4=
-github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 h1:bLRntPH25SkY1uZ/YZW+dmxNky9r1fAHvDFrzluo+4Q=
diff --git a/sdk/resourcemanager/batch/armbatch/go_mod_tidy_hack.go b/sdk/resourcemanager/batch/armbatch/go_mod_tidy_hack.go
deleted file mode 100644
index 6b1d5f6ea58d..000000000000
--- a/sdk/resourcemanager/batch/armbatch/go_mod_tidy_hack.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build modhack
-// +build modhack
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-// This file, and the github.com/Azure/azure-sdk-for-go import, won't actually become part of
-// the resultant binary.
-
-package armbatch
-
-// Necessary for safely adding multi-module repo. See: https://github.com/golang/go/wiki/Modules#is-it-possible-to-add-a-module-to-a-multi-module-repository
-import _ "github.com/Azure/azure-sdk-for-go"
diff --git a/sdk/resourcemanager/batch/armbatch/zz_generated_constants.go b/sdk/resourcemanager/batch/armbatch/zz_generated_constants.go
index 3b3823135057..fac810ba4b72 100644
--- a/sdk/resourcemanager/batch/armbatch/zz_generated_constants.go
+++ b/sdk/resourcemanager/batch/armbatch/zz_generated_constants.go
@@ -10,7 +10,7 @@ package armbatch
 
 const (
 	moduleName    = "armbatch"
-	moduleVersion = "v0.2.0"
+	moduleVersion = "v0.2.1"
 )
 
 // AccountKeyType - The type of account key to regenerate.