diff --git a/src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICollectionSetup.cs b/src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICollectionSetup.cs
index 9c45a2244e..03b07d0e66 100644
--- a/src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICollectionSetup.cs
+++ b/src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/ICollectionSetup.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // -------------------------------------------------------------------------------------------------
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/StoreProcedures/IStoredProcedureMetadata.cs b/src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/StoreProcedures/IStoredProcedureMetadata.cs
index ede1522be7..9131d31eff 100644
--- a/src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/StoreProcedures/IStoredProcedureMetadata.cs
+++ b/src/Microsoft.Health.Fhir.CosmosDb.Core/Features/Storage/StoreProcedures/IStoredProcedureMetadata.cs
@@ -2,9 +2,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // -------------------------------------------------------------------------------------------------
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
 using Microsoft.Azure.Cosmos.Scripts;
 
 namespace Microsoft.Health.Fhir.CosmosDb.Core.Features.Storage.StoredProcedures
diff --git a/src/Microsoft.Health.Fhir.CosmosDb.Initialization/Features/Storage/StoredProcedures/DataPlaneStoredProcedureInstaller.cs b/src/Microsoft.Health.Fhir.CosmosDb.Initialization/Features/Storage/StoredProcedures/DataPlaneStoredProcedureInstaller.cs
index 636ba4fab5..3f162b1e16 100644
--- a/src/Microsoft.Health.Fhir.CosmosDb.Initialization/Features/Storage/StoredProcedures/DataPlaneStoredProcedureInstaller.cs
+++ b/src/Microsoft.Health.Fhir.CosmosDb.Initialization/Features/Storage/StoredProcedures/DataPlaneStoredProcedureInstaller.cs
@@ -17,7 +17,6 @@ public sealed class DataPlaneStoredProcedureInstaller : IStoredProcedureInstalle
     {
         private readonly IEnumerable<IStoredProcedureMetadata> _storeProceduresMetadata;
 
-        // TODO: refactor constructor to have dependency on container
         public DataPlaneStoredProcedureInstaller(IEnumerable<IStoredProcedureMetadata> storedProcedures)
         {
             EnsureArg.IsNotNull(storedProcedures, nameof(storedProcedures));
@@ -25,7 +24,6 @@ public DataPlaneStoredProcedureInstaller(IEnumerable<IStoredProcedureMetadata> s
             _storeProceduresMetadata = storedProcedures;
         }
 
-        // TODO: refactor method to have dependency on IReadOnlyList<Istoredproceduremetada>
         public async Task ExecuteAsync(Container container, CancellationToken cancellationToken)
         {
             foreach (IStoredProcedureMetadata storedProc in _storeProceduresMetadata)