diff --git a/sdk/storage/Azure.Storage.Common/src/Azure.Storage.Common.csproj b/sdk/storage/Azure.Storage.Common/src/Azure.Storage.Common.csproj
index 7cbe9a7a1c91..c8b9d374ce85 100644
--- a/sdk/storage/Azure.Storage.Common/src/Azure.Storage.Common.csproj
+++ b/sdk/storage/Azure.Storage.Common/src/Azure.Storage.Common.csproj
@@ -17,6 +17,9 @@
     </Description>
     <RootNamespace>Azure.Storage</RootNamespace>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Azure.Core" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(AzureCoreSharedSources)NoBodyResponse{T}.cs" Link="Shared\Core\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" Link="Shared\Core\%(RecursiveDir)\%(Filename)%(Extension)" />
diff --git a/sdk/storage/Directory.Build.props b/sdk/storage/Directory.Build.props
index 1302735d79ba..51044c32532d 100644
--- a/sdk/storage/Directory.Build.props
+++ b/sdk/storage/Directory.Build.props
@@ -54,8 +54,6 @@
     <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
-  <Import Condition="'$(IsClientLibrary)' == 'true' AND '$(IsMgmtClientLibrary)' != 'true'" Project="$(MSBuildThisFileDirectory)..\core\Azure.Core\src\Azure.Core.props" />
-
   <!-- Add references for CLIENT LIBRARY projects -->
   <ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(IsClientLibrary)' == 'true'">
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/AzureStorageBlobsWebJobsStartup.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/AzureStorageBlobsWebJobsStartup.cs
index 783db9d9ceb1..174eaad833b5 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/AzureStorageBlobsWebJobsStartup.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/AzureStorageBlobsWebJobsStartup.cs
@@ -9,12 +9,10 @@
 
 namespace Microsoft.Azure.WebJobs.Extensions.Storage
 {
-    /// <summary>
-    /// TODO.
-    /// </summary>
+    /// <inheritdoc cref="IWebJobsStartup"/>
     public class AzureStorageBlobsWebJobsStartup : IWebJobsStartup
     {
-        /// <inheritdoc/>
+        /// <inheritdoc />
         public void Configure(IWebJobsBuilder builder)
         {
             builder.AddAzureStorageBlobs();
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobAttribute.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobAttribute.cs
index 07e3b607d9c5..8a6668a38bac 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobAttribute.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobAttribute.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using Azure.Storage.Blobs.Specialized;
 using Microsoft.Azure.WebJobs.Description;
 
 namespace Microsoft.Azure.WebJobs
@@ -19,11 +20,11 @@ namespace Microsoft.Azure.WebJobs
     /// <remarks>
     /// The method parameter type can be one of the following:
     /// <list type="bullet">
-    /// <item><description>ICloudBlob</description></item>
-    /// <item><description>CloudBlockBlob</description></item>
-    /// <item><description>CloudPageBlob</description></item>
-    /// <item><description><see cref="Stream"/> (read-only)</description></item>
-    /// <item><description>CloudBlobStream (write-only)</description></item>
+    /// <item><description><see cref="BlobBaseClient"/></description></item>
+    /// <item><description><see cref="AppendBlobClient"/></description></item>
+    /// <item><description><see cref="BlockBlobClient"/></description></item>
+    /// <item><description><see cref="PageBlobClient"/></description></item>
+    /// <item><description><see cref="Stream"/></description></item>
     /// <item><description><see cref="TextReader"/></description></item>
     /// <item><description><see cref="TextWriter"/></description></item>
     /// <item><description>
@@ -39,12 +40,13 @@ namespace Microsoft.Azure.WebJobs
     /// The parameter type can be CloudBlobContainer, CloudBlobDirectory or <see cref="IEnumerable{T}"/>
     /// of one of the following element types:
     /// <list type = "bullet" >
-    /// <item><description>ICloudBlob</description></item>
-    /// <item><description>CloudBlockBlob</description></item>
-    /// <item><description>CloudPageBlob</description></item>
-    /// <item><description>Stream</description></item>
-    /// <item><description>string</description></item>
-    /// <item><description>TextReader</description></item>
+    /// <item><description><see cref="BlobBaseClient"/></description></item>
+    /// <item><description><see cref="AppendBlobClient"/></description></item>
+    /// <item><description><see cref="BlockBlobClient"/></description></item>
+    /// <item><description><see cref="PageBlobClient"/></description></item>
+    /// <item><description><see cref="Stream"/></description></item>
+    /// <item><description><see cref="string"/></description></item>
+    /// <item><description><see cref="TextReader"/></description></item>
     /// </list>
     /// </remarks>
     [SuppressMessage("Microsoft.Design", "CA1019:DefineAccessorsForAttributeArguments", Justification = "There is an accessor for FileAccess")]
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobNameValidationAttribute.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobNameValidationAttribute.cs
index 11e452ca0d9f..2a0214e6eae9 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobNameValidationAttribute.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobNameValidationAttribute.cs
@@ -78,11 +78,6 @@ protected override ValidationResult IsValid(object value, ValidationContext vali
             return null;
         }
 
-        /// <summary>
-        /// TODO.
-        /// </summary>
-        /// <param name="containerName"></param>
-        /// <returns></returns>
         internal static bool IsValidContainerName(string containerName)
         {
             if (containerName == null)
@@ -98,13 +93,6 @@ internal static bool IsValidContainerName(string containerName)
             return Regex.IsMatch(containerName, @"^[a-z0-9](([a-z0-9\-[^\-])){1,61}[a-z0-9]$");
         }
 
-        // See http://msdn.microsoft.com/en-us/library/windowsazure/dd135715.aspx.
-        /// <summary>
-        /// TODO.
-        /// </summary>
-        /// <param name="blobName"></param>
-        /// <param name="errorMessage"></param>
-        /// <returns></returns>
         internal static bool IsValidBlobName(string blobName, out string errorMessage)
         {
             const string UnsafeCharactersMessage =
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobTriggerAttribute.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobTriggerAttribute.cs
index b5fa09f37054..1d7a77500590 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobTriggerAttribute.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/BlobTriggerAttribute.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using Azure.Storage.Blobs.Specialized;
 using Microsoft.Azure.WebJobs.Description;
 
 namespace Microsoft.Azure.WebJobs
@@ -17,17 +18,18 @@ namespace Microsoft.Azure.WebJobs
     /// <remarks>
     /// The method parameter type can be one of the following:
     /// <list type="bullet">
-    /// <item><description>ICloudBlob</description></item>
-    /// <item><description>CloudBlockBlob</description></item>
-    /// <item><description>CloudPageBlob</description></item>
+    /// <item><description><see cref="BlobBaseClient"/></description></item>
+    /// <item><description><see cref="AppendBlobClient"/></description></item>
+    /// <item><description><see cref="BlockBlobClient"/></description></item>
+    /// <item><description><see cref="PageBlobClient"/></description></item>
     /// <item><description><see cref="Stream"/></description></item>
     /// <item><description><see cref="TextReader"/></description></item>
     /// <item><description><see cref="string"/></description></item>
     /// <item><description><see cref="T:byte[]"/></description></item>
     /// </list>
     /// </remarks>
-    [AttributeUsage(AttributeTargets.Parameter)]
 #pragma warning restore CA1200 // Avoid using cref tags with a prefix
+    [AttributeUsage(AttributeTargets.Parameter)]
     [DebuggerDisplay("{BlobPath,nq}")]
     [ConnectionProvider(typeof(StorageAccountAttribute))]
     [Binding]
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/StorageBlobsWebJobsBuilderExtensions.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/StorageBlobsWebJobsBuilderExtensions.cs
index 0591197cf022..b2509d471afe 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/StorageBlobsWebJobsBuilderExtensions.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/StorageBlobsWebJobsBuilderExtensions.cs
@@ -21,16 +21,15 @@
 namespace Microsoft.Extensions.Hosting
 {
     /// <summary>
-    /// TODO.
+    /// Extension methods for Storage Blobs integration.
     /// </summary>
     public static class StorageBlobsWebJobsBuilderExtensions
     {
         /// <summary>
-        /// TODO.
+        /// Adds the Storage Blobs extension to the provided <see cref="IWebJobsBuilder"/>.
         /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="configureBlobs"></param>
-        /// <returns></returns>
+        /// <param name="builder">The <see cref="IWebJobsBuilder"/> to configure.</param>
+        /// <param name="configureBlobs">Optional. An action to configure <see cref="BlobsOptions"/>.</param>
         public static IWebJobsBuilder AddAzureStorageBlobs(this IWebJobsBuilder builder, Action<BlobsOptions> configureBlobs = null)
         {
             builder.Services.AddAzureClientsCore();
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs
index 26b782d627fe..b224d59c80f0 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueListener.cs
@@ -115,8 +115,6 @@ public QueueListener(QueueClient queue,
                 _sharedWatcher = sharedWatcher;
             }
 
-            // TODO (kasobol-msft) remove this
-            //_queueProcessor = CreateQueueProcessor(_queue, _poisonQueue, loggerFactory, queueProcessorFactory, _queueOptions, _sharedWatcher);
             _queueProcessor = queueProcessor;
 
             TimeSpan maximumInterval = _queueProcessor.QueuesOptions.MaxPollingInterval;
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueProcessor.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueProcessor.cs
index 14fd198a7b74..56321752b714 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueProcessor.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueProcessor.cs
@@ -54,9 +54,6 @@ internal protected QueueProcessor(QueueProcessorOptions queueProcessorOptions)
         /// </summary>
         public event EventHandler<PoisonMessageEventArgs> MessageAddedToPoisonQueue;
 
-        /// <summary>
-        /// TODO.
-        /// </summary>
         internal QueuesOptions QueuesOptions { get; private set; }
 
         /// <summary>
@@ -86,7 +83,7 @@ internal protected virtual async Task<bool> BeginProcessingMessageAsync(QueueMes
         /// </remarks>
         /// <param name="message">The message to complete processing for.</param>
         /// <param name="result">The <see cref="FunctionResult"/> from the job invocation.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use.</param>
         /// <returns></returns>
         internal protected virtual async Task CompleteProcessingMessageAsync(QueueMessage message, FunctionResult result, CancellationToken cancellationToken)
         {
@@ -125,9 +122,9 @@ private async Task HandlePoisonMessageAsync(QueueMessage message, CancellationTo
         /// <summary>
         /// Moves the specified message to the poison queue.
         /// </summary>
-        /// <param name="message">The poison message</param>
-        /// <param name="poisonQueue">The poison queue to copy the message to</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use</param>
+        /// <param name="message">The poison message.</param>
+        /// <param name="poisonQueue">The poison queue to copy the message to.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use.</param>
         /// <returns></returns>
         protected virtual async Task CopyMessageToPoisonQueueAsync(QueueMessage message, QueueClient poisonQueue, CancellationToken cancellationToken)
         {
@@ -145,8 +142,8 @@ protected virtual async Task CopyMessageToPoisonQueueAsync(QueueMessage message,
         /// </summary>
         /// <param name="message">The message to release</param>
         /// <param name="result">The <see cref="FunctionResult"/> from the job invocation.</param>
-        /// <param name="visibilityTimeout">The visibility timeout to set for the message</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use</param>
+        /// <param name="visibilityTimeout">The visibility timeout to set for the message.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use.</param>
         /// <returns></returns>
         protected virtual async Task ReleaseMessageAsync(QueueMessage message, FunctionResult result, TimeSpan visibilityTimeout, CancellationToken cancellationToken)
         {
@@ -179,7 +176,7 @@ protected virtual async Task ReleaseMessageAsync(QueueMessage message, FunctionR
         /// Delete the specified message.
         /// </summary>
         /// <param name="message">The message to delete.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use.</param>
         /// <returns></returns>
         protected virtual async Task DeleteMessageAsync(QueueMessage message, CancellationToken cancellationToken)
         {
@@ -217,9 +214,9 @@ protected virtual async Task DeleteMessageAsync(QueueMessage message, Cancellati
         }
 
         /// <summary>
-        /// Called to raise the MessageAddedToPoisonQueue event
+        /// Called to raise the MessageAddedToPoisonQueue event.
         /// </summary>
-        /// <param name="e">The event arguments</param>
+        /// <param name="e">The event arguments.</param>
         protected internal virtual void OnMessageAddedToPoisonQueue(PoisonMessageEventArgs e)
         {
             MessageAddedToPoisonQueue?.Invoke(this, e);
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueProcessorOptions.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueProcessorOptions.cs
index 29ab0f753f3a..e145b7a95fe2 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueProcessorOptions.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueueProcessorOptions.cs
@@ -20,7 +20,7 @@ internal partial class QueueProcessorOptions
         /// <summary>
         /// Constructs a new instance.
         /// </summary>
-        /// <param name="queue">TODO.</param>
+        /// <param name="queue">The queue the <see cref="QueueProcessor"/> will operate on.</param>
         /// <param name="loggerFactory">The <see cref="ILoggerFactory"/> to create an <see cref="ILogger"/> from.</param>
         /// <param name="options">The queue configuration.</param>
         /// <param name="poisonQueue">The queue to move messages to when unable to process a message after the maximum dequeue count has been exceeded. May be null.</param>
@@ -33,13 +33,12 @@ internal QueueProcessorOptions(QueueClient queue, ILoggerFactory loggerFactory,
         }
 
         /// <summary>
-        /// TODO.
+        /// Gets the queue the <see cref="QueueProcessor"/> will operate on.
         /// </summary>
         public QueueClient Queue { get; private set; }
 
         /// <summary>
-        /// TODO.
-        /// May be null.
+        /// Gets the queue to move messages to when unable to process a message after the maximum dequeue count has been exceeded. May be null.
         /// </summary>
         public QueueClient PoisonQueue { get; private set; }
 
@@ -49,7 +48,7 @@ internal QueueProcessorOptions(QueueClient queue, ILoggerFactory loggerFactory,
         public ILogger Logger { get; private set; }
 
         /// <summary>
-        /// TODO.
+        /// Gets the queue configuration.
         /// </summary>
         public QueuesOptions Options { get; private set; }
     }
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueuesOptions.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueuesOptions.cs
index 5f5b9de63735..d3465d9246ff 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueuesOptions.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/Queues/QueuesOptions.cs
@@ -11,10 +11,10 @@
 
 namespace Microsoft.Azure.WebJobs.Host
 {
+#if STORAGE_WEBJOBS_PUBLIC_QUEUE_PROCESSOR
     /// <summary>
-    /// TODO.
+    /// Represents configuration for <see cref="QueueTriggerAttribute"/>.
     /// </summary>
-#if STORAGE_WEBJOBS_PUBLIC_QUEUE_PROCESSOR
     public class QueuesOptions : IOptionsFormatter
 #else
     internal class QueuesOptions : IOptionsFormatter
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/StorageClientProvider.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/StorageClientProvider.cs
index da89e37af365..42c4fd3c7257 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/StorageClientProvider.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/src/Shared/StorageClientProvider.cs
@@ -24,12 +24,6 @@ internal abstract class StorageClientProvider<TClient, TClientOptions> where TCl
         private readonly AzureComponentFactory _componentFactory;
         private readonly AzureEventSourceLogForwarder _logForwarder;
 
-        /// <summary>
-        /// TODO.
-        /// </summary>
-        /// <param name="configuration"></param>
-        /// <param name="componentFactory"></param>
-        /// <param name="logForwarder"></param>
         public StorageClientProvider(IConfiguration configuration, AzureComponentFactory componentFactory, AzureEventSourceLogForwarder logForwarder)
         {
             _configuration = configuration;
@@ -37,23 +31,12 @@ public StorageClientProvider(IConfiguration configuration, AzureComponentFactory
             _logForwarder = logForwarder;
         }
 
-        /// <summary>
-        /// TODO.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="resolver"></param>
-        /// <returns></returns>
         public virtual TClient Get(string name, INameResolver resolver)
         {
             var resolvedName = resolver.ResolveWholeString(name);
             return this.Get(resolvedName);
         }
 
-        /// <summary>
-        /// TODO.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
         public virtual TClient Get(string name)
         {
             if (string.IsNullOrWhiteSpace(name))
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/AzureStorageQueuesWebJobsStartup.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/AzureStorageQueuesWebJobsStartup.cs
index b48174825317..56f618738559 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/AzureStorageQueuesWebJobsStartup.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/AzureStorageQueuesWebJobsStartup.cs
@@ -9,9 +9,7 @@
 
 namespace Microsoft.Azure.WebJobs.Extensions.Storage
 {
-    /// <summary>
-    /// TODO.
-    /// </summary>
+    /// <inheritdoc cref="IWebJobsStartup"/>
     public class AzureStorageQueuesWebJobsStartup : IWebJobsStartup
     {
         /// <inheritdoc/>
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/QueueAttribute.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/QueueAttribute.cs
index 18ce0669dccb..73d6e45f7a59 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/QueueAttribute.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/QueueAttribute.cs
@@ -3,6 +3,8 @@
 
 using System;
 using System.Diagnostics;
+using Azure.Storage.Queues;
+using Azure.Storage.Queues.Models;
 using Microsoft.Azure.WebJobs.Description;
 
 namespace Microsoft.Azure.WebJobs
@@ -15,8 +17,8 @@ namespace Microsoft.Azure.WebJobs
     /// <remarks>
     /// The method parameter type can be one of the following:
     /// <list type="bullet">
-    /// <item><description>CloudQueue</description></item>
-    /// <item><description>CloudQueueMessage (out parameter)</description></item>
+    /// <item><description><see cref="QueueClient"/></description></item>
+    /// <item><description><see cref="QueueMessage"/> (out parameter)</description></item>
     /// <item><description><see cref="string"/> (out parameter)</description></item>
     /// <item><description><see cref="T:byte[]"/> (out parameter)</description></item>
     /// <item><description>A user-defined type (out parameter, serialized as JSON)</description></item>
@@ -24,8 +26,8 @@ namespace Microsoft.Azure.WebJobs
     /// <item><description><see cref="IAsyncCollector{T}"/> of these types (to enqueue multiple messages via <see cref="IAsyncCollector{T}.AddAsync(T, System.Threading.CancellationToken)"/></description></item>
     /// </list>
     /// </remarks>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes")]
 #pragma warning restore CA1200 // Avoid using cref tags with a prefix
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes")]
     [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
     [DebuggerDisplay("{QueueName,nq}")]
     [ConnectionProvider(typeof(StorageAccountAttribute))]
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/QueueTriggerAttribute.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/QueueTriggerAttribute.cs
index 52cca040f5ca..b4357aec1d64 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/QueueTriggerAttribute.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/QueueTriggerAttribute.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using Azure.Storage.Queues.Models;
 using Microsoft.Azure.WebJobs.Description;
 
 namespace Microsoft.Azure.WebJobs
@@ -16,7 +17,7 @@ namespace Microsoft.Azure.WebJobs
     /// <remarks>
     /// The method parameter type can be one of the following:
     /// <list type="bullet">
-    /// <item><description>CloudQueueMessage</description></item>
+    /// <item><description><see cref="QueueMessage"/></description></item>
     /// <item><description><see cref="string"/></description></item>
     /// <item><description><see cref="T:byte[]"/></description></item>
     /// <item><description>A user-defined type (serialized as JSON)</description></item>
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/StorageQueuesWebJobsBuilderExtensions.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/StorageQueuesWebJobsBuilderExtensions.cs
index b8c58b8b992f..995f78427552 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/StorageQueuesWebJobsBuilderExtensions.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/StorageQueuesWebJobsBuilderExtensions.cs
@@ -2,14 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
-using Azure.Core;
 using Azure.WebJobs.Extensions.Storage.Queues;
 using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.Extensions.Storage;
 using Microsoft.Azure.WebJobs.Extensions.Storage.Common;
 using Microsoft.Azure.WebJobs.Extensions.Storage.Common.Listeners;
 using Microsoft.Azure.WebJobs.Host;
-using Microsoft.Azure.WebJobs.Host.Listeners;
 using Microsoft.Azure.WebJobs.Host.Queues;
 using Microsoft.Azure.WebJobs.Host.Queues.Config;
 using Microsoft.Azure.WebJobs.Host.Queues.Listeners;
@@ -21,16 +18,15 @@
 namespace Microsoft.Extensions.Hosting
 {
     /// <summary>
-    /// TODO.
+    /// Extension methods for Storage Queues integration.
     /// </summary>
     public static class StorageQueuesWebJobsBuilderExtensions
     {
         /// <summary>
-        /// TODO.
+        /// Adds the Storage Queues extension to the provided <see cref="IWebJobsBuilder"/>.
         /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="configureQueues"></param>
-        /// <returns></returns>
+        /// <param name="builder">The <see cref="IWebJobsBuilder"/> to configure.</param>
+        /// <param name="configureQueues">Optional. An action to configure <see cref="QueuesOptions"/>.</param>
         public static IWebJobsBuilder AddAzureStorageQueues(this IWebJobsBuilder builder, Action<QueuesOptions> configureQueues = null)
         {
             builder.Services.AddAzureClientsCore();
diff --git a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Scenario.Tests/tests/BlobBindingEndToEndTests.cs b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Scenario.Tests/tests/BlobBindingEndToEndTests.cs
index 92e0807f8693..24f0768416c1 100644
--- a/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Scenario.Tests/tests/BlobBindingEndToEndTests.cs
+++ b/sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Scenario.Tests/tests/BlobBindingEndToEndTests.cs
@@ -318,7 +318,6 @@ public async Task BindToByteArray_Output()
             arguments = new { input = TestData };
             await _fixture.JobHost.CallAsync(method, arguments);
 
-            // TODO (this sometimes results in empty string
             Assert.True(await blob.ExistsAsync());
             string result = await blob.DownloadTextAsync();
             Assert.AreEqual(TestData, result);