diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs
index 04bc2db1..0761644f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs
@@ -271,7 +271,7 @@ WHERE do.database_id = @DbID
 
                 isSystemDB = db.IsSystemObject;
 
-                ResourceManager manager = new ResourceManager("Microsoft.SqlServer.Management.SqlManagerUI.CreateDatabaseStrings", typeof(DatabasePrototype).Assembly);
+                ResourceManager manager = new ResourceManager("Microsoft.SqlTools.ServiceLayer.Localization.SR", typeof(DatabasePrototype).Assembly);
 
                 this.owner = db.Owner;
 
@@ -2012,7 +2012,7 @@ WHERE do.database_id = @DbID
                         (this.currentState.owner != this.originalState.owner))
                     {
                         //
-                        // bug 20000092 says the error message is confusing if this fails, so 
+                        // the error message is confusing if this fails, so 
                         // wrap this and throw a nicer error on failure.
                         //
                         try
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototypeAzure.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototypeAzure.cs
index 77146dd4..8c90bab1 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototypeAzure.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototypeAzure.cs
@@ -180,9 +180,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Admin
         {
             get { return this.ServerVersion.Major > 11 && this.AzureEdition != AzureEdition.DataWarehouse; }
         }
-
-        // [Browsable(false)]
-        // public SubscriptionLocationKey AzureServiceLocation { get; set; }
         
         public string BackupStorageRedundancy
         {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs
index 5f8f18f9..8907fade 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs
@@ -67,9 +67,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Security
         
         private UserPrototype InitUserNew(CDataContainer dataContainer, UserInfo user)
         {
-            // this.DataContainer = context;          
-            // this.parentDbUrn = new Urn(this.DataContainer.ParentUrn); 
-            // this.objectUrn = new Urn(this.DataContainer.ObjectUrn);
             ExhaustiveUserTypes currentUserType;
             UserPrototypeFactory userPrototypeFactory = UserPrototypeFactory.GetInstance(dataContainer, user);