diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
index 39915edca..c581698f9 100644
--- a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
+++ b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Changed return type of `DataLakeFileSystemClient::GetProperties` to `DataLakeFileSystemProperties`.
 - Changed return type of `DataLakeFileSystemClient::GetAccessPolicy` to `DataLakeFileSystemAccessPolicy`.
 - Changed return type of `DataLakePathClient::GetProperties` to `DataLakePathProperties`.
+- Removed `GetUserDelegationKeyResult`.
 
 ## 12.0.0-beta.8 (2021-02-12)
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
index 4dd124b80..23704c150 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
@@ -15,7 +15,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
 
   // ServiceClient models:
 
-  using GetUserDelegationKeyResult = Blobs::Models::UserDelegationKey;
   using UserDelegationKey = Blobs::Models::UserDelegationKey;
 
   struct FileSystemItemDetails
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp
index 1a2bbc4ac..57ac5c157 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp
@@ -98,8 +98,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
      * will be truncated to second.
      * @param options Optional parameters to execute this function.
      * @param context Context for cancelling long running operations.
-     * @return Azure::Response<Models::UserDelegationKey> containing the user
-     * delegation key related information.
+     * @return Azure::Response<Models::UserDelegationKey> containing the user delegation key.
      * @remark This request is sent to blob endpoint.
      */
     Azure::Response<Models::UserDelegationKey> GetUserDelegationKey(
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp
index 7e1be32db..7d6baa4a8 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp
@@ -418,7 +418,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
           Azure::Core::Http::Request request(Azure::Core::Http::HttpMethod::Get, url);
           request.GetUrl().AppendQueryParameter(
               _detail::QueryFileSystemResource,
-              _internal::UrlEncodeQueryParameter((listPathsOptions.Resource.ToString())));
+              _internal::UrlEncodeQueryParameter(listPathsOptions.Resource.ToString()));
           if (listPathsOptions.Timeout.HasValue())
           {
             request.GetUrl().AppendQueryParameter(
@@ -580,7 +580,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
           {
             request.GetUrl().AppendQueryParameter(
                 _detail::QueryPathResourceType,
-                _internal::UrlEncodeQueryParameter((createOptions.Resource.GetValue().ToString())));
+                _internal::UrlEncodeQueryParameter(createOptions.Resource.GetValue().ToString()));
           }
           if (createOptions.ContinuationToken.HasValue())
           {
@@ -592,7 +592,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
           {
             request.GetUrl().AppendQueryParameter(
                 _detail::QueryPathRenameMode,
-                _internal::UrlEncodeQueryParameter((createOptions.Mode.GetValue().ToString())));
+                _internal::UrlEncodeQueryParameter(createOptions.Mode.GetValue().ToString()));
           }
           if (createOptions.CacheControl.HasValue())
           {
@@ -720,7 +720,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
             request.GetUrl().AppendQueryParameter(
                 _detail::QueryPathGetPropertiesAction,
                 _internal::UrlEncodeQueryParameter(
-                    (getPropertiesOptions.Action.GetValue().ToString())));
+                    getPropertiesOptions.Action.GetValue().ToString()));
           }
           if (getPropertiesOptions.Upn.HasValue())
           {
@@ -942,8 +942,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
           }
           request.GetUrl().AppendQueryParameter(
               _detail::QueryPathSetAccessControlRecursiveMode,
-              _internal::UrlEncodeQueryParameter(
-                  (setAccessControlRecursiveOptions.Mode.ToString())));
+              _internal::UrlEncodeQueryParameter(setAccessControlRecursiveOptions.Mode.ToString()));
           if (setAccessControlRecursiveOptions.ForceFlag.HasValue())
           {
             request.GetUrl().AppendQueryParameter(