diff --git a/snippets/cpp/VS_Snippets_Remoting/Classic HttpWebRequest.ConnectionGroupName Example/CPP/source.cpp b/snippets/cpp/VS_Snippets_Remoting/Classic HttpWebRequest.ConnectionGroupName Example/CPP/source.cpp
deleted file mode 100644
index a1ed8be7efe..00000000000
--- a/snippets/cpp/VS_Snippets_Remoting/Classic HttpWebRequest.ConnectionGroupName Example/CPP/source.cpp	
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-#using <System.dll>
-#using <System.Web.dll>
-
-using namespace System;
-using namespace System::Net;
-using namespace System::Web;
-using namespace System::Web::UI;
-using namespace System::Security::Cryptography;
-using namespace System::Text;
-int main()
-{
-   // <Snippet1>  
-   // Create a secure group name.
-   // This example uses the SHA1 algorithm.
-   // Due to collision problems with SHA1, Microsoft recommends SHA256 or better.
-   SHA1Managed^ Sha1 = gcnew SHA1Managed;
-   array<Byte>^updHash = Sha1->ComputeHash( Encoding::UTF8->GetBytes( "usernamepassworddomain" ) );
-   String^ secureGroupName = Encoding::Default->GetString( updHash );
-
-   // Create a request for a specific URL.
-   WebRequest^ myWebRequest = WebRequest::Create( "http://www.contoso.com" );
-
-   // Set the authentication credentials for the request.      
-   myWebRequest->Credentials = gcnew NetworkCredential( "username","password","domain" );
-   myWebRequest->ConnectionGroupName = secureGroupName;
-
-   // Get the response.
-   WebResponse^ myWebResponse = myWebRequest->GetResponse();
-
-   // Insert the code that uses myWebResponse here.
-   // Close the response.
-   myWebResponse->Close();
-   // </Snippet1>
-}
diff --git a/snippets/csharp/System.Net/WebRequest/PreAuthenticate/Project.csproj b/snippets/csharp/System.Net/WebRequest/PreAuthenticate/Project.csproj
deleted file mode 100644
index c02dc5044e7..00000000000
--- a/snippets/csharp/System.Net/WebRequest/PreAuthenticate/Project.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-   
-</Project>
\ No newline at end of file
diff --git a/snippets/csharp/System.Net/WebRequest/PreAuthenticate/webrequest_preauthenticate.cs b/snippets/csharp/System.Net/WebRequest/PreAuthenticate/webrequest_preauthenticate.cs
deleted file mode 100644
index 82fe68271b1..00000000000
--- a/snippets/csharp/System.Net/WebRequest/PreAuthenticate/webrequest_preauthenticate.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*System.Net.WebRequest.PreAuthenticate,System.Net.WebRequest.Credentials
- This program demonstrates the 'PreAuthenticate' and 'NetworkCredential' properties of the WebRequest Class.
-The PreAuthenticate Property has a default value set to False.
-This is set to True and new NetwrokCredential object is created with UserName and Password.  
-This NetworkCredential Object associated to the WebRequest Object to be able to authenticate the requested Uri
-To check the validity of this program, please try with some authenticated sites with appropriate credentials*/ 
-
-using System;
-using System.IO;
-using System.Net;
-using System.Text;
-
-class WebRequest_Preauthenticate
-{
-	static void Main(string[] args)
-	{
-		if (args.Length < 1) 
-		{	
-			Console.WriteLine("\nPlease type the url which requires authentication as command line parameter");
-			Console.WriteLine("Example:WebRequest_PreAuthenticate http://www.microsoft.com");		
-		} 
-		else 
-		{
-			GetPage(args[0]);
-		}
-		Console.WriteLine("\nPress any key to continue...");
-		Console.ReadLine();
-		return;
-	}
-	public static void GetPage(string url)
-	{
-		try
-		{
-// <Snippet1>
-// <Snippet2>
-
-            // Create a new webrequest to the mentioned URL.
-			WebRequest myWebRequest=WebRequest.Create(url);
-
-			// Set 'Preauthenticate'  property to true.  Credentials will be sent with the request.
-			myWebRequest.PreAuthenticate=true;
-
-			Console.WriteLine("\nPlease enter your credentials for the requested Url");
-            Console.WriteLine("UserName");
-			string UserName=Console.ReadLine();
-			Console.WriteLine("Password");
-			string Password=Console.ReadLine();
-
-			// Create a New 'NetworkCredential' object.
-			NetworkCredential networkCredential=new NetworkCredential(UserName,Password);
-
-			// Associate the 'NetworkCredential' object with the 'WebRequest' object.
-			myWebRequest.Credentials=networkCredential;
-
-			// Assign the response object of 'WebRequest' to a 'WebResponse' variable.
-			WebResponse myWebResponse=myWebRequest.GetResponse();
-			
-// </Snippet2>
-// </Snippet1>
-			// Read the 'Response' into a Stream object and then print to the console.		
-			Stream streamResponse=myWebResponse.GetResponseStream();
-			StreamReader streamRead = new StreamReader( streamResponse );
-			Char[] readBuff = new Char[256];
-			int count = streamRead.Read( readBuff, 0, 256 );
-			Console.WriteLine("\nThe contents of the Html page of the requested Uri are : ");
-			while (count > 0) 
-			{
-				String outputData = new String(readBuff, 0, count);
-				Console.Write(outputData);
-				count = streamRead.Read(readBuff, 0, 256);
-			}
-			// Close the Stream object.
-			streamResponse.Close();
-			streamRead.Close();
-			// Release the HttpWebResponse Resource.
-			myWebResponse.Close();
-		}
-		catch(WebException e)
-		{
-			Console.WriteLine("\nWebException is raised. ");
-			Console.WriteLine("\nMessage:{0} ",e.Message);			
-		}
-		catch(Exception e)
-		{
-			Console.WriteLine("\nException is raised. ");
-			Console.WriteLine("\nMessage:{0} ",e.Message);
-		}
-	}	
-}
diff --git a/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/Project.csproj b/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/Project.csproj
new file mode 100644
index 00000000000..543b3a6c115
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/Project.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net481</TargetFramework>
+    <LangVersion>11</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/makefile b/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/makefile
deleted file mode 100644
index 2a0ebf3c0a6..00000000000
--- a/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: service.exe
- 
-service.exe: service.cs 
- csc /t:exe *.cs /r:System.ServiceModel.dll,System.Runtime.Serialization.dll,System.IdentityModel.dll /lib:c:\whidbey\assemblies
diff --git a/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/service.cs b/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/service.cs
index 0e9c0997326..4ee45f4127a 100644
--- a/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/service.cs
+++ b/snippets/csharp/VS_Snippets_CFX/c_claimset/cs/service.cs
@@ -4,22 +4,17 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
-
 using System.IdentityModel.Claims;
 using System.IdentityModel.Policy;
-using System.IdentityModel.Tokens;
 using System.IdentityModel.Selectors;
-
 using System.Security.Principal;
 
 using System.ServiceModel;
-using System.ServiceModel.Description;
-using System.ServiceModel.Security;
 
 namespace Microsoft.ServiceModel.Samples
 {
     // Define a service contract.
-    [ServiceContract(Namespace="http://Microsoft.ServiceModel.Samples")]
+    [ServiceContract(Namespace = "http://Microsoft.ServiceModel.Samples")]
     public interface ICalculator
     {
         [OperationContract]
@@ -34,8 +29,8 @@ public interface ICalculator
 
     // Service class that implements the service contract.
     // Added code to write output to the console window.
-	[ServiceBehavior(IncludeExceptionDetailInFaults=true)]
-	
+    [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
+
     public class CalculatorService : ICalculator
     {
         public double Add(double n1, double n2)
@@ -43,7 +38,7 @@ public double Add(double n1, double n2)
             double result = n1 + n2;
             Console.WriteLine("Received Add({0},{1})", n1, n2);
             Console.WriteLine("Return: {0}", result);
-			return result;
+            return result;
         }
 
         public double Subtract(double n1, double n2)
@@ -74,7 +69,7 @@ public double Divide(double n1, double n2)
         public class MyServiceAuthorizationManager : ServiceAuthorizationManager
         {
 
-           protected override bool CheckAccessCore(OperationContext operationContext)
+            protected override bool CheckAccessCore(OperationContext operationContext)
             {
                 // Extract the action URI from the OperationContext. Match this against the claims
                 // in the AuthorizationContext.
@@ -83,7 +78,7 @@ protected override bool CheckAccessCore(OperationContext operationContext)
                 Console.WriteLine("action: {0}", action);
 
                 // Iterate through the various claim sets in the AuthorizationContext.
-                foreach(ClaimSet cs in operationContext.ServiceSecurityContext.AuthorizationContext.ClaimSets)
+                foreach (ClaimSet cs in operationContext.ServiceSecurityContext.AuthorizationContext.ClaimSets)
                 {
                     // Examine only those claim sets issued by System.
                     if (cs.Issuer == ClaimSet.System)
@@ -109,13 +104,14 @@ protected override bool CheckAccessCore(OperationContext operationContext)
             }
         }
         // </snippet1>
+
         public class MyAuthorizationPolicy : IAuthorizationPolicy
         {
             string id;
 
             public MyAuthorizationPolicy()
             {
-                id =  Guid.NewGuid().ToString();
+                id = Guid.NewGuid().ToString();
             }
 
             //
@@ -158,7 +154,7 @@ public bool Evaluate(EvaluationContext evaluationContext, ref object state)
                             }
 
                     // Add claims to the evaluation context.
-                    evaluationContext.AddClaimSet(this, new DefaultClaimSet(this.Issuer,claims));
+                    evaluationContext.AddClaimSet(this, new DefaultClaimSet(this.Issuer, claims));
 
                     // Record that the claims have been added.
                     customstate.ClaimsAdded = true;
@@ -193,14 +189,14 @@ private IEnumerable<string> GetAllowedOpList(string username)
 
                 if (username == "test1")
                 {
-                    ret.Add ( "http://Microsoft.ServiceModel.Samples/ICalculator/Add");
-                    ret.Add ("http://Microsoft.ServiceModel.Samples/ICalculator/Multiply");
+                    ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Add");
+                    ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Multiply");
                     ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Subtract");
                 }
                 else if (username == "test2")
                 {
-                    ret.Add ( "http://Microsoft.ServiceModel.Samples/ICalculator/Add");
-                    ret.Add ("http://Microsoft.ServiceModel.Samples/ICalculator/Subtract");
+                    ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Add");
+                    ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Subtract");
                 }
                 return ret;
             }
@@ -215,28 +211,19 @@ public CustomAuthState()
                     bClaimsAdded = false;
                 }
 
-                public bool ClaimsAdded { get { return bClaimsAdded; }
-                                          set {  bClaimsAdded = value; } }
+                public bool ClaimsAdded
+                {
+                    get { return bClaimsAdded; }
+                    set { bClaimsAdded = value; }
+                }
             }
         }
 
         public class MyCustomUserNameValidator : UserNamePasswordValidator
         {
-            // This method validates users. It allows two users, test1 and test2
-            // with passwords 1tset and 2tset respectively.
-            // This code is for illustration purposes only and
-            // MUST NOT be used in a production environment because it is NOT secure.	
             public override void Validate(string userName, string password)
             {
-                if (null == userName || null == password)
-                {
-                    throw new ArgumentNullException();
-                }
-
-                if (!(userName == "test1" && password == "1tset") && !(userName == "test2" && password == "2tset"))
-                {
-                    throw new SecurityTokenException("Unknown Username or Password");
-                }
+                throw new NotImplementedException();
             }
         }
 
@@ -244,17 +231,17 @@ public override void Validate(string userName, string password)
         public static void Main()
         {
             // Get the base address from appsettings in configuration.
-            Uri baseAddress = new Uri(ConfigurationManager.AppSettings["baseAddress"]);
+            Uri baseAddress = new(ConfigurationManager.AppSettings["baseAddress"]);
 
             // Create a ServiceHost for the CalculatorService type and provide the base address.
             using (ServiceHost serviceHost = new ServiceHost(typeof(CalculatorService), baseAddress))
             {
                 // Open the ServiceHostBase to create listeners and start listening for messages.
                 serviceHost.Open();
-				
+
                 // The service can now be accessed.
                 Console.WriteLine("The service is ready.");
-				Console.WriteLine("The service is running in the following account: {0}", WindowsIdentity.GetCurrent().Name);
+                Console.WriteLine("The service is running in the following account: {0}", WindowsIdentity.GetCurrent().Name);
                 Console.WriteLine("Press <ENTER> to terminate service.");
                 Console.WriteLine();
                 Console.ReadLine();
diff --git a/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/Project.csproj b/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/Project.csproj
new file mode 100644
index 00000000000..f59f82c3d22
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/Project.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net481</TargetFramework>
+    <LangVersion>11</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/makefile b/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/makefile
deleted file mode 100644
index 2a0ebf3c0a6..00000000000
--- a/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: service.exe
- 
-service.exe: service.cs 
- csc /t:exe *.cs /r:System.ServiceModel.dll,System.Runtime.Serialization.dll,System.IdentityModel.dll /lib:c:\whidbey\assemblies
diff --git a/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/service.cs b/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/service.cs
index cd522e1384e..3db20bd7174 100644
--- a/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/service.cs
+++ b/snippets/csharp/VS_Snippets_CFX/c_iauthorizationpolicy/cs/service.cs
@@ -7,19 +7,16 @@
 
 using System.IdentityModel.Claims;
 using System.IdentityModel.Policy;
-using System.IdentityModel.Tokens;
 using System.IdentityModel.Selectors;
 
 using System.Security.Principal;
 
 using System.ServiceModel;
-using System.ServiceModel.Description;
-using System.ServiceModel.Security;
 
 namespace Microsoft.ServiceModel.Samples
 {
     // Define a service contract.
-    [ServiceContract(Namespace="http://Microsoft.ServiceModel.Samples")]
+    [ServiceContract(Namespace = "http://Microsoft.ServiceModel.Samples")]
     public interface ICalculator
     {
         [OperationContract]
@@ -34,8 +31,8 @@ public interface ICalculator
 
     // Service class that implements the service contract.
     // Added code to write output to the console window.
-	[ServiceBehavior(IncludeExceptionDetailInFaults=true)]
-	
+    [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
+
     public class CalculatorService : ICalculator
     {
         public double Add(double n1, double n2)
@@ -43,7 +40,7 @@ public double Add(double n1, double n2)
             double result = n1 + n2;
             Console.WriteLine("Received Add({0},{1})", n1, n2);
             Console.WriteLine("Return: {0}", result);
-			return result;
+            return result;
         }
 
         public double Subtract(double n1, double n2)
@@ -83,7 +80,7 @@ protected override bool CheckAccessCore(OperationContext operationContext)
 
                 // <snippet5>
                 // Iterate through the various claim sets in the AuthorizationContext.
-                foreach(ClaimSet cs in operationContext.ServiceSecurityContext.AuthorizationContext.ClaimSets)
+                foreach (ClaimSet cs in operationContext.ServiceSecurityContext.AuthorizationContext.ClaimSets)
                 {
                     // Examine only those claim sets issued by System.
                     if (cs.Issuer == ClaimSet.System)
@@ -114,7 +111,7 @@ public class MyAuthorizationPolicy : IAuthorizationPolicy
 
             public MyAuthorizationPolicy()
             {
-                id =  Guid.NewGuid().ToString();
+                id = Guid.NewGuid().ToString();
             }
 
             // <snippet2>
@@ -156,7 +153,7 @@ public bool Evaluate(EvaluationContext evaluationContext, ref object state)
                             }
 
                     // Add claims to the evaluation context.
-                    evaluationContext.AddClaimSet(this, new DefaultClaimSet(this.Issuer,claims));
+                    evaluationContext.AddClaimSet(this, new DefaultClaimSet(this.Issuer, claims));
 
                     // Record that claims have been added.
                     customstate.ClaimsAdded = true;
@@ -192,14 +189,14 @@ private IEnumerable<string> GetAllowedOpList(string username)
 
                 if (username == "test1")
                 {
-                    ret.Add ( "http://Microsoft.ServiceModel.Samples/ICalculator/Add");
-                    ret.Add ("http://Microsoft.ServiceModel.Samples/ICalculator/Multiply");
+                    ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Add");
+                    ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Multiply");
                     ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Subtract");
                 }
                 else if (username == "test2")
                 {
-                    ret.Add ( "http://Microsoft.ServiceModel.Samples/ICalculator/Add");
-                    ret.Add ("http://Microsoft.ServiceModel.Samples/ICalculator/Subtract");
+                    ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Add");
+                    ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Subtract");
                 }
                 return ret;
             }
@@ -214,29 +211,20 @@ public CustomAuthState()
                     bClaimsAdded = false;
                 }
 
-                public bool ClaimsAdded { get { return bClaimsAdded; }
-                                          set {  bClaimsAdded = value; } }
+                public bool ClaimsAdded
+                {
+                    get { return bClaimsAdded; }
+                    set { bClaimsAdded = value; }
+                }
             }
         }
-
         // </snippet1>
+
         public class MyCustomUserNameValidator : UserNamePasswordValidator
         {
-            // This method validates users. It allows two users, test1 and test2
-            // with passwords 1tset and 2tset respectively.
-            // This code is for illustration purposes only and
-            // MUST NOT be used in a production environment because it is NOT secure.	
             public override void Validate(string userName, string password)
             {
-                if (null == userName || null == password)
-                {
-                    throw new ArgumentNullException();
-                }
-
-                if (!(userName == "test1" && password == "1tset") && !(userName == "test2" && password == "2tset"))
-                {
-                    throw new SecurityTokenException("Unknown Username or Password");
-                }
+                throw new NotImplementedException();
             }
         }
 
@@ -251,10 +239,10 @@ public static void Main()
             {
                 // Open the ServiceHostBase to create listeners and start listening for messages.
                 serviceHost.Open();
-				
+
                 // The service can now be accessed.
                 Console.WriteLine("The service is ready.");
-				Console.WriteLine("The service is running in the following account: {0}", WindowsIdentity.GetCurrent().Name);
+                Console.WriteLine("The service is running in the following account: {0}", WindowsIdentity.GetCurrent().Name);
                 Console.WriteLine("Press <ENTER> to terminate service.");
                 Console.WriteLine();
                 Console.ReadLine();
diff --git a/snippets/csharp/VS_Snippets_CFX/c_usernamevalidator/cs/makefile b/snippets/csharp/VS_Snippets_CFX/c_usernamevalidator/cs/makefile
deleted file mode 100644
index 2a0ebf3c0a6..00000000000
--- a/snippets/csharp/VS_Snippets_CFX/c_usernamevalidator/cs/makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: service.exe
- 
-service.exe: service.cs 
- csc /t:exe *.cs /r:System.ServiceModel.dll,System.Runtime.Serialization.dll,System.IdentityModel.dll /lib:c:\whidbey\assemblies
diff --git a/snippets/csharp/VS_Snippets_CFX/c_usernamevalidator/cs/service.cs b/snippets/csharp/VS_Snippets_CFX/c_usernamevalidator/cs/service.cs
deleted file mode 100644
index 21db5215365..00000000000
--- a/snippets/csharp/VS_Snippets_CFX/c_usernamevalidator/cs/service.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-
-//  Copyright (c) Microsoft Corporation.  All Rights Reserved.
-
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-
-using System.IdentityModel.Claims;
-using System.IdentityModel.Policy;
-using System.IdentityModel.Tokens;
-using System.IdentityModel.Selectors;
-
-using System.Security.Principal;
-
-using System.ServiceModel;
-using System.ServiceModel.Description;
-using System.ServiceModel.Security;
-
-namespace Microsoft.ServiceModel.Samples
-{
-    // Define a service contract.
-    [ServiceContract(Namespace="http://Microsoft.ServiceModel.Samples")]
-    public interface ICalculator
-    {
-        [OperationContract]
-        double Add(double n1, double n2);
-        [OperationContract]
-        double Subtract(double n1, double n2);
-        [OperationContract]
-        double Multiply(double n1, double n2);
-        [OperationContract]
-        double Divide(double n1, double n2);
-    }
-
-    // Service class that implements the service contract.
-    // Added code to write output to the console window.
-	[ServiceBehavior(IncludeExceptionDetailInFaults=true)]
-	
-    public class CalculatorService : ICalculator
-    {
-        public double Add(double n1, double n2)
-        {
-            double result = n1 + n2;
-            Console.WriteLine("Received Add({0},{1})", n1, n2);
-            Console.WriteLine("Return: {0}", result);
-			return result;
-        }
-
-        public double Subtract(double n1, double n2)
-        {
-            double result = n1 - n2;
-            Console.WriteLine("Received Subtract({0},{1})", n1, n2);
-            Console.WriteLine("Return: {0}", result);
-            return result;
-        }
-
-        public double Multiply(double n1, double n2)
-        {
-            double result = n1 * n2;
-            Console.WriteLine("Received Multiply({0},{1})", n1, n2);
-            Console.WriteLine("Return: {0}", result);
-            return result;
-        }
-
-        public double Divide(double n1, double n2)
-        {
-            double result = n1 / n2;
-            Console.WriteLine("Received Divide({0},{1})", n1, n2);
-            Console.WriteLine("Return: {0}", result);
-            return result;
-        }
-
-        public class MyServiceAuthorizationManager : ServiceAuthorizationManager
-        {
-
-           protected override bool CheckAccessCore(OperationContext operationContext)
-            {
-                // Extract the action URI from the OperationContext. Match this against the claims
-                // in the AuthorizationContext.
-                string action = operationContext.RequestContext.RequestMessage.Headers.Action;
-                Console.WriteLine("action: {0}", action);
-
-                //
-                // Iterate through the various claimsets in the AuthorizationContext.
-                foreach(ClaimSet cs in operationContext.ServiceSecurityContext.AuthorizationContext.ClaimSets)
-                {
-                    // Only look at claimsets issued by System.
-                    if (cs.Issuer == ClaimSet.System)
-                    {
-                        // Iterate through claims of type "http://example.org/claims/allowedoperation".
-                        foreach (Claim c in cs.FindClaims("http://example.org/claims/allowedoperation", Rights.PossessProperty))
-                        {
-                            // Write the Claim resource to the console.
-                            Console.WriteLine("resource: {0}", c.Resource.ToString());
-
-                            // If the Claim resource matches the action URI then return true to allow access.
-                            if (action == c.Resource.ToString())
-                                return true;
-                        }
-                    }
-                }
-
-                // If we get here, return false, denying access.
-                return false;
-            }
-        }
-
-        public class MyAuthorizationPolicy : IAuthorizationPolicy
-        {
-            string id;
-
-            public MyAuthorizationPolicy()
-            {
-                id =  Guid.NewGuid().ToString();
-            }
-
-            //
-            public bool Evaluate(EvaluationContext evaluationContext, ref object state)
-            {
-                bool bRet = false;
-                CustomAuthState customstate = null;
-
-                // If state is null, then this method has not been called before so we need
-                // to set up our custom state.
-                if (state == null)
-                {
-                    customstate = new CustomAuthState();
-                    state = customstate;
-                }
-                else
-                {
-                    customstate = (CustomAuthState)state;
-                }
-
-                Console.WriteLine("Inside MyAuthorizationPolicy::Evaluate");
-
-                // If claims have not been added yet...
-                if (!customstate.ClaimsAdded)
-                {
-                    // Create an empty list of Claims.
-                    IList<Claim> claims = new List<Claim>();
-
-                    // Iterate through each of the claimsets in the evaluation context.
-                    foreach (ClaimSet cs in evaluationContext.ClaimSets)
-                        // Look for Name claims in the current claimset.
-                        foreach (Claim c in cs.FindClaims(ClaimTypes.Name, Rights.PossessProperty))
-                            // Get the list of operations that the given username is allowed to call.
-                            foreach (string s in GetAllowedOpList(c.Resource.ToString()))
-                            {
-                                // Add claims to the list
-                                claims.Add(new Claim("http://example.org/claims/allowedoperation", s, Rights.PossessProperty));
-                                Console.WriteLine("Claim added {0}", s);
-                            }
-
-                    // Add claims to the evaluation context.
-                    evaluationContext.AddClaimSet(this, new DefaultClaimSet(this.Issuer,claims));
-
-                    // Record that the claims have been added.
-                    customstate.ClaimsAdded = true;
-
-                    // Return true, which indicates we do not need to call this method again.
-                    bRet = true;
-                }
-                else
-                {
-                    // Should never get here, but just in case...
-                    bRet = true;
-                }
-
-                return bRet;
-            }
-            //
-            //
-            public ClaimSet Issuer
-            {
-                get { return ClaimSet.System; }
-            }
-
-            public string Id
-            {
-                get { return id; }
-            }
-
-            // This method returns a collection of action strings that indicate the
-            // operations that the specified username is allowed to call.
-            private IEnumerable<string> GetAllowedOpList(string username)
-            {
-                IList<string> ret = new List<string>();
-
-                if (username == "test1")
-                {
-                    ret.Add ( "http://Microsoft.ServiceModel.Samples/ICalculator/Add");
-                    ret.Add ("http://Microsoft.ServiceModel.Samples/ICalculator/Multiply");
-                    ret.Add("http://Microsoft.ServiceModel.Samples/ICalculator/Subtract");
-                }
-                else if (username == "test2")
-                {
-                    ret.Add ( "http://Microsoft.ServiceModel.Samples/ICalculator/Add");
-                    ret.Add ("http://Microsoft.ServiceModel.Samples/ICalculator/Subtract");
-                }
-                return ret;
-            }
-
-            // Internal class for state.
-            class CustomAuthState
-            {
-                bool bClaimsAdded;
-
-                public CustomAuthState()
-                {
-                    bClaimsAdded = false;
-                }
-
-                public bool ClaimsAdded { get { return bClaimsAdded; }
-                                          set {  bClaimsAdded = value; } }
-            }
-        }
-
-        // <snippet1>
-        public class MyCustomUserNameValidator : UserNamePasswordValidator
-        {
-            // <snippet2>
-            // This method validates users. It allows two users, test1 and test2
-            // with passwords 1tset and 2tset respectively.
-            // This code is for illustration purposes only and
-            // MUST NOT be used in a production environment because it is NOT secure.	
-            public override void Validate(string userName, string password)
-            {
-                if (null == userName || null == password)
-                {
-                    throw new ArgumentNullException();
-                }
-
-                if (!(userName == "test1" && password == "1tset") && !(userName == "test2" && password == "2tset"))
-                {
-                    throw new SecurityTokenException("Unknown Username or Password");
-                }
-            }
-            // </snippet2>
-        }
-        // </snippet1>
-        // Host the service within this EXE console application.
-        public static void Main()
-        {
-            // Get base address from appsettings in configuration.
-            Uri baseAddress = new Uri(ConfigurationManager.AppSettings["baseAddress"]);
-
-            // Create a ServiceHost for the CalculatorService type and provide the base address.
-            using (ServiceHost serviceHost = new ServiceHost(typeof(CalculatorService), baseAddress))
-            {
-                // Open the ServiceHostBase to create listeners and start listening for messages.
-                serviceHost.Open();
-				
-                // The service can now be accessed.
-                Console.WriteLine("The service is ready.");
-				Console.WriteLine("The service is running in the following account: {0}", WindowsIdentity.GetCurrent().Name);
-                Console.WriteLine("Press <ENTER> to terminate service.");
-                Console.WriteLine();
-                Console.ReadLine();
-
-                // Close the ServiceHostBase to shutdown the service.
-                serviceHost.Close();
-            }
-        }
-    }
-}
diff --git a/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/app.config b/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/app.config
new file mode 100644
index 00000000000..eca069e41db
--- /dev/null
+++ b/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
diff --git a/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/cs.csproj b/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/cs.csproj
index 0bce8db16c1..c69a768df41 100644
--- a/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/cs.csproj
+++ b/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/cs.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CS</RootNamespace>
     <AssemblyName>CS</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -18,6 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -26,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -46,6 +55,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="service.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/makefile b/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/makefile
deleted file mode 100644
index 76fd23ac8a0..00000000000
--- a/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-Program.exe: Program.cs 
- csc /t:exe Program.cs service.cs /r:System.dll,System.ServiceModel.dll,System.Data.dll,System.IdentityModel.dll,System.ServiceModel.dll,System.Xml.dll,System.Configuration.dll 
diff --git a/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/program.cs b/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/program.cs
index 79b18af7d39..538f28ed40d 100644
--- a/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/program.cs
+++ b/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/program.cs
@@ -9,56 +9,40 @@ namespace Microsoft.ServiceModel.Samples
 
     //<snippet10>
     [ServiceContract]
-    interface IMyService {
+    interface IMyService
+    {
 
-    //Define the contract operations.
+        //Define the contract operations.
     }
 
-    class MyService : IMyService {
+    class MyService : IMyService
+    {
 
-    //Implement the IMyService operations.
+        //Implement the IMyService operations.
     }
     //</snippet10>
 
     public class Test
     {
 
-	private void CreateNetTcpBinding()
+        private void CreateNetTcpBinding()
         {
-        //<snippet20>
-	    NetTcpBinding b = new NetTcpBinding();
-	    b.Security.Mode = SecurityMode.Message;
-	    Type c = typeof(SayHello);
-
-        //<snippet4>
-	    Uri a = new Uri("net.tcp://MyMachineName/tcpBase");
-	    Uri[] baseAddresses = new Uri[] { a };
-	    ServiceHost sh = new ServiceHost(typeof(SayHello), baseAddresses);
-	    sh.AddServiceEndpoint(c, b, "Aloha");
-        sh.Credentials.ServiceCertificate.SetCertificate(
-            StoreLocation.LocalMachine,
-            StoreName.My,
-            X509FindType.FindByThumbprint,
-            "af1f50b20cd413ed9cd00c315bbb6dc1c08da5e6");
-	    sh.Open();
-        //</snippet4>
-	
-        //</snippet20>
-        }
-
-        private void EnablePortSharing()
-        {
-            //<snippet3>
-
-            NetTcpBinding portsharingBinding = new NetTcpBinding();
-            portsharingBinding.PortSharingEnabled = true;
-
-            ServiceHost host = new ServiceHost( typeof( MyService ) );
-            host.AddServiceEndpoint( typeof( IMyService ),
-                                     portsharingBinding,
-                                     "net.tcp://localhost/MyService" );
-
-            //</snippet3>
+            NetTcpBinding b = new NetTcpBinding();
+            b.Security.Mode = SecurityMode.Message;
+            Type c = typeof(SayHello);
+
+            //<snippet4>
+            Uri a = new Uri("net.tcp://MyMachineName/tcpBase");
+            Uri[] baseAddresses = new Uri[] { a };
+            ServiceHost sh = new ServiceHost(typeof(SayHello), baseAddresses);
+            sh.AddServiceEndpoint(c, b, "Aloha");
+            sh.Credentials.ServiceCertificate.SetCertificate(
+                StoreLocation.LocalMachine,
+                StoreName.My,
+                X509FindType.FindByThumbprint,
+                "af1f50b20cd413ed9cd00c315bbb6dc1c08da5e6");
+            sh.Open();
+            //</snippet4>
         }
     }
 }
diff --git a/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/service.cs b/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/service.cs
index 05cacf932cf..910fad60deb 100644
--- a/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/service.cs
+++ b/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/service.cs
@@ -7,14 +7,11 @@
 
 using System.IdentityModel.Claims;
 using System.IdentityModel.Policy;
-using System.IdentityModel.Tokens;
 using System.IdentityModel.Selectors;
 
 using System.Security.Principal;
 
 using System.ServiceModel;
-using System.ServiceModel.Description;
-using System.ServiceModel.Security;
 
 namespace Microsoft.ServiceModel.Samples
 {
@@ -227,29 +224,14 @@ public bool ClaimsAdded
             }
         }
 
-        //
         public class MyCustomUserNameValidator : UserNamePasswordValidator
         {
-            //
-            // This method validates users. It allows in two users, test1 and test2
-            // with passwords 1tset and 2tset respectively.
-            // This code is for illustration purposes only and
-            // MUST NOT be used in a production environment becuase it is NOT secure.	
             public override void Validate(string userName, string password)
             {
-                if (null == userName || null == password)
-                {
-                    throw new ArgumentNullException();
-                }
-
-                if (!(userName == "test1" && password == "1tset") && !(userName == "test2" && password == "2tset"))
-                {
-                    throw new SecurityTokenException("Unknown Username or Password");
-                }
+                throw new NotImplementedException();
             }
-            //
         }
-        //
+
         // Host the service within this EXE console application.
         public static void Main()
         {
diff --git a/snippets/csharp/VS_Snippets_CFX/s_ueusernamepasswordvalidationmode/cs/makefile b/snippets/csharp/VS_Snippets_CFX/s_ueusernamepasswordvalidationmode/cs/makefile
deleted file mode 100644
index 497c5b08ad3..00000000000
--- a/snippets/csharp/VS_Snippets_CFX/s_ueusernamepasswordvalidationmode/cs/makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: service.exe
- 
-service.exe: service.cs 
- csc /t:exe service.cs /r:System.ServiceModel.dll,System.IdentityModel.dll,System.Runtime.Serialization.dll /lib:c:\whidbey\assemblies
diff --git a/snippets/csharp/VS_Snippets_CFX/s_ueusernamepasswordvalidationmode/cs/service.cs b/snippets/csharp/VS_Snippets_CFX/s_ueusernamepasswordvalidationmode/cs/service.cs
deleted file mode 100644
index 74a624d7745..00000000000
--- a/snippets/csharp/VS_Snippets_CFX/s_ueusernamepasswordvalidationmode/cs/service.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-
-//  Copyright (c) Microsoft Corporation.  All Rights Reserved.
-
-using System;
-using System.IdentityModel.Tokens;
-using System.ServiceModel;
-using System.Security.Principal;
-using System.Threading;
-using System.Web.Security;
-using System.ServiceModel.Security;
-using System.IdentityModel.Selectors;
-
-namespace Microsoft.ServiceModel.Samples
-{
-    // Define a service contract.
-    [ServiceContract(Namespace = "http://Microsoft.ServiceModel.Samples")]
-    public interface ICalculator
-    {
-        [OperationContract]
-        double Add(double n1, double n2);
-        [OperationContract]
-        double Subtract(double n1, double n2);
-        [OperationContract]
-        double Multiply(double n1, double n2);
-        [OperationContract]
-        double Divide(double n1, double n2);
-    }
-
-    // Service class which implements the service contract.
-    // Added code to write output to the console window
-    public class CalculatorService : ICalculator
-    {
-        static void DisplayIdentityInformation()
-        {
-            Console.WriteLine("\t\tSecurity context identity  :  {0}", ServiceSecurityContext.Current.PrimaryIdentity.Name);
-        }
-
-        public double Add(double n1, double n2)
-        {
-            DisplayIdentityInformation();
-            double result = n1 + n2;
-            Console.WriteLine("Received Add({0},{1})", n1, n2);
-            Console.WriteLine("Return: {0}", result);
-            return result;
-        }
-
-        public double Subtract(double n1, double n2)
-        {
-            DisplayIdentityInformation();
-            double result = n1 - n2;
-            Console.WriteLine("Received Subtract({0},{1})", n1, n2);
-            Console.WriteLine("Return: {0}", result);
-            return result;
-        }
-
-        public double Multiply(double n1, double n2)
-        {
-            DisplayIdentityInformation();
-            double result = n1 * n2;
-            Console.WriteLine("Received Multiply({0},{1})", n1, n2);
-            Console.WriteLine("Return: {0}", result);
-            return result;
-        }
-
-        public double Divide(double n1, double n2)
-        {
-            DisplayIdentityInformation();
-            double result = n1 / n2;
-            Console.WriteLine("Received Divide({0},{1})", n1, n2);
-            Console.WriteLine("Return: {0}", result);
-            return result;
-        }
-
-        //<snippet1>
-        // Host the service within this EXE console application.
-        public static void Main()
-        {
-            // Create a ServiceHost for the CalculatorService type and provide the base address.
-            using (ServiceHost serviceHost = new ServiceHost(typeof(CalculatorService)))
-            {
-                serviceHost.Credentials.UserNameAuthentication.UserNamePasswordValidationMode = UserNamePasswordValidationMode.Custom;
-                serviceHost.Credentials.UserNameAuthentication.CustomUserNamePasswordValidator = new MyUserNamePasswordValidator();
-
-                // Open the ServiceHostBase to create listeners and start listening for messages.
-                serviceHost.Open();
-
-                // The service can now be accessed.
-                Console.WriteLine("The service is ready.");
-                Console.WriteLine("The service is running in the following account: {0}", WindowsIdentity.GetCurrent().Name);
-                Console.WriteLine("Press <ENTER> to terminate service.");
-                Console.WriteLine();
-                Console.ReadLine();
-            }
-        }
-        //</snippet1>
-    }
-
-    public class MyUserNamePasswordValidator : UserNamePasswordValidator
-    {
-        public override void Validate(string userName, string password)
-        {
-            // check that username matches password
-            if (null == userName || userName != password)
-            {
-                Console.WriteLine("Invalid username or password");
-                throw new SecurityTokenValidationException("Invalid username or password");
-            }
-        }
-    }
-}
diff --git a/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/Project.vbproj b/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/Project.vbproj
new file mode 100644
index 00000000000..bd368c38872
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/Project.vbproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net481</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/makefile b/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/makefile
deleted file mode 100644
index f6299afdfba..00000000000
--- a/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: MyAuthorizationPolicy.exe
- 
-MyAuthorizationPolicy.exe: MyAuthorizationPolicy.vb 
- vbc /t:library *.vb /r:System.ServiceModel.dll,System.Runtime.Serialization.dll,system.IdentityModel.dll /libpath:c:\whidbey\assemblies
diff --git a/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/myauthorizationpolicy.vb b/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/myauthorizationpolicy.vb
index c3f79c4a906..6597c61486e 100644
--- a/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/myauthorizationpolicy.vb
+++ b/snippets/visualbasic/VS_Snippets_CFX/c_claimset/vb/myauthorizationpolicy.vb
@@ -1,15 +1,9 @@
-
-Imports System.Collections.Generic
-Imports System.IdentityModel.Claims
+Imports System.IdentityModel.Claims
 Imports System.IdentityModel.Policy
-Imports System.IdentityModel.Tokens
-Imports System.IdentityModel.Selectors
-Imports System.ServiceModel
 Imports System.Security.Permissions
+Imports System.ServiceModel
 
-
-
-<assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution := True)>
+<Assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution:=True)>
 ' <snippet1>
 Public Class MyServiceAuthorizationManager
     Inherits ServiceAuthorizationManager
@@ -46,10 +40,10 @@ Public Class MyServiceAuthorizationManager
         ' If this point is reached, return false to deny access.
         Return False
 
-    End Function 
+    End Function
     ' </snippet1>
-End Class 
- 
+End Class
+
 Public Class MyAuthorizationPolicy
     Implements IAuthorizationPolicy
     Private value_id As String
@@ -58,9 +52,9 @@ Public Class MyAuthorizationPolicy
     Public Sub New()
         value_id = Guid.NewGuid().ToString()
 
-    End Sub 
+    End Sub
 
-    Public Function Evaluate(ByVal evaluationContext As EvaluationContext, _
+    Public Function Evaluate(ByVal evaluationContext As EvaluationContext,
         ByRef state As Object) As Boolean Implements IAuthorizationPolicy.Evaluate
 
         Dim bRet As Boolean = False
@@ -90,14 +84,14 @@ Public Class MyAuthorizationPolicy
                     ' Get the list of operations that the given username is allowed to call.
                     Dim s As String
                     For Each s In GetAllowedOpList(c.Resource.ToString())
- 
-                       ' Add claims to the list.
-                        claims.Add(New Claim("http://example.org/claims/allowedoperation", _
+
+                        ' Add claims to the list.
+                        claims.Add(New Claim("http://example.org/claims/allowedoperation",
                                    s, Rights.PossessProperty))
                         Console.WriteLine("Claim added {0}", s)
                     Next s
                 Next c
-            Next cs 
+            Next cs
 
             ' Add claims to the evaluation context.
             evaluationContext.AddClaimSet(Me, New DefaultClaimSet(Me.Issuer, claims))
@@ -115,7 +109,7 @@ Public Class MyAuthorizationPolicy
 
         Return bRet
 
-    End Function 
+    End Function
 
     Public ReadOnly Property Issuer() As ClaimSet Implements IAuthorizationPolicy.Issuer
 
@@ -135,7 +129,6 @@ Public Class MyAuthorizationPolicy
     ' operations that the specified username is allowed to call.
     Private Shared Function GetAllowedOpList(ByVal username As String) As IEnumerable(Of String)
 
-
         Dim ret As New List(Of String)
 
         If username = "test1" Then
@@ -148,19 +141,17 @@ Public Class MyAuthorizationPolicy
         End If
         Return ret
 
-    End Function 
+    End Function
 
     ' This is an internal class for recording state.
 
     Class CustomAuthState
         Private bClaimsAdded As Boolean
 
-
         Public Sub New()
 
         End Sub
 
-
         Public Property ClaimsAdded() As Boolean
             Get
                 Return bClaimsAdded
@@ -169,6 +160,6 @@ Public Class MyAuthorizationPolicy
                 bClaimsAdded = value
             End Set
         End Property
-    End Class 
-End Class 
-' 
\ No newline at end of file
+    End Class
+End Class
+' 
diff --git a/snippets/visualbasic/VS_Snippets_CFX/c_usernamevalidator/vb/makefile b/snippets/visualbasic/VS_Snippets_CFX/c_usernamevalidator/vb/makefile
deleted file mode 100644
index 0d5b740de1e..00000000000
--- a/snippets/visualbasic/VS_Snippets_CFX/c_usernamevalidator/vb/makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: service.exe
- 
-service.exe: service.vb 
- vbc /t:exe *.vb /r:System.ServiceModel.dll,System.Runtime.Serialization.dll,system.IdentityModel.dll /libpath:c:\whidbey\assemblies
diff --git a/snippets/visualbasic/VS_Snippets_CFX/c_usernamevalidator/vb/service.vb b/snippets/visualbasic/VS_Snippets_CFX/c_usernamevalidator/vb/service.vb
deleted file mode 100644
index 417529f6ef4..00000000000
--- a/snippets/visualbasic/VS_Snippets_CFX/c_usernamevalidator/vb/service.vb
+++ /dev/null
@@ -1,122 +0,0 @@
-'  Copyright (c) Microsoft Corporation.  All Rights Reserved.
-Imports System.Collections.Generic
-
-Imports System.IdentityModel.Claims
-Imports System.IdentityModel.Policy
-Imports System.IdentityModel.Tokens
-Imports System.IdentityModel.Selectors
-
-Imports System.Security.Principal
-
-Imports System.ServiceModel
-Imports System.ServiceModel.Description
-Imports System.ServiceModel.Security
-
-
-' Define a service contract.
-<ServiceContract([Namespace]:="http://Microsoft.ServiceModel.Samples")> _
-Public Interface ICalculator
-    <OperationContract()> _
-    Function Add(ByVal n1 As Double, ByVal n2 As Double) As Double
-    <OperationContract()> _
-    Function Subtract(ByVal n1 As Double, ByVal n2 As Double) As Double
-    <OperationContract()> _
-    Function Multiply(ByVal n1 As Double, ByVal n2 As Double) As Double
-    <OperationContract()> _
-    Function Divide(ByVal n1 As Double, ByVal n2 As Double) As Double
-End Interface 'ICalculator
-
-' Service class that implements the service contract.
-' Added code to write output to the console window.
-<ServiceBehavior(IncludeExceptionDetailInFaults:=True)> _
-Public Class CalculatorService
-
-    Implements ICalculator
-
-    Public Function Add(ByVal n1 As Double, ByVal n2 As Double) As Double Implements ICalculator.Add
-
-        Dim result As Double = n1 + n2
-        Console.WriteLine("Received Add({0},{1})", n1, n2)
-        Console.WriteLine("Return: {0}", result)
-        Return result
-
-    End Function 'Add
-
-
-
-    Public Function Subtract(ByVal n1 As Double, ByVal n2 As Double) As Double Implements ICalculator.Subtract
-
-        Dim result As Double = n1 - n2
-        Console.WriteLine("Received Subtract({0},{1})", n1, n2)
-        Console.WriteLine("Return: {0}", result)
-        Return result
-
-    End Function 'Subtract
-
-
-
-    Public Function Multiply(ByVal n1 As Double, ByVal n2 As Double) As Double Implements ICalculator.Multiply
-
-        Dim result As Double = n1 * n2
-        Console.WriteLine("Received Multiply({0},{1})", n1, n2)
-        Console.WriteLine("Return: {0}", result)
-        Return result
-
-    End Function 'Multiply
-
-
-
-    Public Function Divide(ByVal n1 As Double, ByVal n2 As Double) As Double Implements ICalculator.Divide
-        Dim result As Double = n1 / n2
-        Console.WriteLine("Received Divide({0},{1})", n1, n2)
-        Console.WriteLine("Return: {0}", result)
-        Return result
-
-    End Function 'Divide
-
-
-
-
-
-    ' Host the service within this EXE console application.
-    Public Shared Sub Main()
-        ' Create a ServiceHost for the CalculatorService type and provide the base address.
-        Dim serviceHost As New ServiceHost(GetType(CalculatorService))
-        ' Open the ServiceHost to create listeners and start listening for messages.
-        serviceHost.Open()
-
-        ' The service can now be accessed.
-        Console.WriteLine("The service is ready.")
-        Console.WriteLine("The service is running in the following account: {0}", WindowsIdentity.GetCurrent().Name)
-        Console.WriteLine("Press <ENTER> to terminate service.")
-        Console.WriteLine()
-        Console.ReadLine()
-
-        ' Close the ServiceHost to shutdown the service.
-        serviceHost.Close()
-
-    End Sub
-End Class
-
-' <snippet1>
-Public Class MyCustomUserNameValidator
-    Inherits UserNamePasswordValidator
-
-    ' <snippet2>
-    ' This method validates users. It allows two users, test1 and test2 
-    ' with passwords 1tset and 2tset respectively.
-    ' This code is for illustration purposes only and 
-    ' MUST NOT be used in a production environment because it is NOT secure.	
-    Public Overrides Sub Validate(ByVal userName As String, ByVal password As String)
-        If Nothing = userName OrElse Nothing = password Then
-            Throw New ArgumentNullException()
-        End If
-
-        If Not (userName = "test1" AndAlso password = "1tset") AndAlso Not (userName = "test2" AndAlso password = "2tset") Then
-            Throw New SecurityTokenException("Unknown Username or Password")
-        End If
-
-    End Sub
-    ' </snippet2>
-End Class
-' </snippet1>
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/Project.vbproj b/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/Project.vbproj
new file mode 100644
index 00000000000..ae298073f7e
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/Project.vbproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net481</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ServiceModel.Primitives" Version="8.1.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/makefile b/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/makefile
deleted file mode 100644
index 45a28b2ea2e..00000000000
--- a/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: source.exe
- 
-source.exe: source.vb 
- vbc /t:exe source.vb /r:System.ServiceModel.dll,System.Runtime.Serialization.dll,System.IdentityModel.dll /lib:c:\whidbey\assemblies
diff --git a/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/source.vb b/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/source.vb
index 8828b3d6c64..833dc0b71b7 100644
--- a/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/source.vb
+++ b/snippets/visualbasic/VS_Snippets_CFX/s_uewindowsservicecredential/vb/source.vb
@@ -1,87 +1,85 @@
-Imports System.Runtime.Serialization
-Imports System.ServiceModel
-Imports System.ServiceModel.Security
+Imports System.ServiceModel
 Imports System.ServiceModel.Description
-Imports System.Security.Cryptography.X509Certificates
+Imports System.ServiceModel.Security
 
 Namespace Example
-	Public Class Test
-		Shared Sub Main()
-			Dim t As New Test()
-			t.Snippet1()
-		End Sub
-
-
-			Private Sub Snippet1()
-				'<snippet1>
-				' Create a service host.
-				Dim httpUri As New Uri("http://localhost/Calculator")
-				Dim sh As New ServiceHost(GetType(Calculator), httpUri)
-
-				' Create a binding that uses a WindowsServiceCredential.
-				Dim b As New WSHttpBinding(SecurityMode.Message)
-				b.Security.Message.ClientCredentialType = MessageCredentialType.Windows
-
-				' Add an endpoint.
-				sh.AddServiceEndpoint(GetType(ICalculator), b, "WindowsCalculator")
-
-				' Get a reference to the WindowsServiceCredential object.
-				Dim winCredential As WindowsServiceCredential = sh.Credentials.WindowsAuthentication
-				' Print out values.
-				Console.WriteLine("IncludeWindowsGroup: {0}", winCredential.IncludeWindowsGroups)
-				Console.WriteLine("UserNamePasswordValidationMode: {0}", winCredential.AllowAnonymousLogons)
-
-				Console.ReadLine()
-				'</snippet1>
-			End Sub
-			Private Sub Snippet2()
-				'<snippet2>
-				' Create a service host.
-				Dim httpUri As New Uri("http://localhost/Calculator")
-				Dim sh As New ServiceHost(GetType(Calculator), httpUri)
-
-				' Create a binding that uses a WindowsServiceCredential .
-				Dim b As New WSHttpBinding(SecurityMode.Message)
-				b.Security.Message.ClientCredentialType = MessageCredentialType.Windows
-
-				' Add an endpoint.
-				sh.AddServiceEndpoint(GetType(ICalculator), b, "WindowsCalculator")
-
-				' Get a reference to the WindowsServiceCredential object.
-				Dim ssCredential As SecureConversationServiceCredential = sh.Credentials.SecureConversationAuthentication
-
-				'</snippet2>
-			End Sub
-			Private Sub Snippet3()
-				'<snippet3>
-				' Create a service host.
-				Dim httpUri As New Uri("http://localhost/Calculator")
-				Dim sh As New ServiceHost(GetType(Calculator), httpUri)
-
-				' Create a binding that uses a WindowsServiceCredential .
-				Dim b As New WSHttpBinding(SecurityMode.Message)
-				b.Security.Message.ClientCredentialType = MessageCredentialType.Windows
-
-				' Add an endpoint.
-				sh.AddServiceEndpoint(GetType(ICalculator), b, "WindowsCalculator")
-
-				' Clone these credentials.
-				Dim cloneCredential As ServiceCredentials = sh.Credentials.Clone()
-
-				'</snippet3>
-			End Sub
-	End Class
-
-	<ServiceContract> _
-	Friend Interface ICalculator
-		<OperationContract> _
-		Function Add(ByVal a As Double, ByVal b As Double) As Double
-	End Interface
-
-	Public Class Calculator
-		Implements ICalculator
-		Public Function Add(ByVal a As Double, ByVal b As Double) As Double Implements ICalculator.Add
-			Return a + b
-		End Function
-	End Class
-End Namespace
\ No newline at end of file
+    Public Class Test
+        Shared Sub Main()
+            Dim t As New Test()
+            t.Snippet1()
+        End Sub
+
+
+        Private Sub Snippet1()
+            '<snippet1>
+            ' Create a service host.
+            Dim httpUri As New Uri("http://localhost/Calculator")
+            Dim sh As New ServiceHost(GetType(Calculator), httpUri)
+
+            ' Create a binding that uses a WindowsServiceCredential.
+            Dim b As New WSHttpBinding(SecurityMode.Message)
+            b.Security.Message.ClientCredentialType = MessageCredentialType.Windows
+
+            ' Add an endpoint.
+            sh.AddServiceEndpoint(GetType(ICalculator), b, "WindowsCalculator")
+
+            ' Get a reference to the WindowsServiceCredential object.
+            Dim winCredential As WindowsServiceCredential = sh.Credentials.WindowsAuthentication
+            ' Print out values.
+            Console.WriteLine("IncludeWindowsGroup: {0}", winCredential.IncludeWindowsGroups)
+            Console.WriteLine("UserNamePasswordValidationMode: {0}", winCredential.AllowAnonymousLogons)
+
+            Console.ReadLine()
+            '</snippet1>
+        End Sub
+        Private Sub Snippet2()
+            '<snippet2>
+            ' Create a service host.
+            Dim httpUri As New Uri("http://localhost/Calculator")
+            Dim sh As New ServiceHost(GetType(Calculator), httpUri)
+
+            ' Create a binding that uses a WindowsServiceCredential .
+            Dim b As New WSHttpBinding(SecurityMode.Message)
+            b.Security.Message.ClientCredentialType = MessageCredentialType.Windows
+
+            ' Add an endpoint.
+            sh.AddServiceEndpoint(GetType(ICalculator), b, "WindowsCalculator")
+
+            ' Get a reference to the WindowsServiceCredential object.
+            Dim ssCredential As SecureConversationServiceCredential = sh.Credentials.SecureConversationAuthentication
+
+            '</snippet2>
+        End Sub
+        Private Sub Snippet3()
+            '<snippet3>
+            ' Create a service host.
+            Dim httpUri As New Uri("http://localhost/Calculator")
+            Dim sh As New ServiceHost(GetType(Calculator), httpUri)
+
+            ' Create a binding that uses a WindowsServiceCredential .
+            Dim b As New WSHttpBinding(SecurityMode.Message)
+            b.Security.Message.ClientCredentialType = MessageCredentialType.Windows
+
+            ' Add an endpoint.
+            sh.AddServiceEndpoint(GetType(ICalculator), b, "WindowsCalculator")
+
+            ' Clone these credentials.
+            Dim cloneCredential As ServiceCredentials = sh.Credentials.Clone()
+
+            '</snippet3>
+        End Sub
+    End Class
+
+    <ServiceContract>
+    Friend Interface ICalculator
+        <OperationContract>
+        Function Add(ByVal a As Double, ByVal b As Double) As Double
+    End Interface
+
+    Public Class Calculator
+        Implements ICalculator
+        Public Function Add(ByVal a As Double, ByVal b As Double) As Double Implements ICalculator.Add
+            Return a + b
+        End Function
+    End Class
+End Namespace
diff --git a/xml/System.IdentityModel.Selectors/UserNamePasswordValidator.xml b/xml/System.IdentityModel.Selectors/UserNamePasswordValidator.xml
index 27dbfe05847..0dfa0a14539 100644
--- a/xml/System.IdentityModel.Selectors/UserNamePasswordValidator.xml
+++ b/xml/System.IdentityModel.Selectors/UserNamePasswordValidator.xml
@@ -17,17 +17,11 @@
   <Docs>
     <summary>Validates a username and password.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.IdentityModel.Selectors.UserNamePasswordValidator> class to specify how a username and password is validated. This can be done by deriving a class from <xref:System.IdentityModel.Selectors.UserNamePasswordValidator> and override the <xref:System.IdentityModel.Selectors.UserNamePasswordValidator.Validate%2A> method. For more information about creating a custom user name and password validator, see [How to: Use a Custom User Name and Password Validator](/dotnet/framework/wcf/feature-details/how-to-use-a-custom-user-name-and-password-validator).  
-  
-   
-  
-## Examples  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_usernamevalidator/cs/service.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_usernamevalidator/vb/service.vb" id="Snippet1":::  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.IdentityModel.Selectors.UserNamePasswordValidator> class to specify how a username and password is validated. This can be done by deriving a class from <xref:System.IdentityModel.Selectors.UserNamePasswordValidator> and overriding the <xref:System.IdentityModel.Selectors.UserNamePasswordValidator.Validate%2A> method. For more information about creating a custom user name and password validator, see [How to: Use a Custom User Name and Password Validator](/dotnet/framework/wcf/feature-details/how-to-use-a-custom-user-name-and-password-validator).
+
  ]]></format>
     </remarks>
   </Docs>
@@ -74,11 +68,11 @@
         <summary>Gets an instance of a <see cref="T:System.IdentityModel.Selectors.UserNamePasswordValidator" /> that validates a username and password using the specified membership provider.</summary>
         <returns>An <see cref="T:System.IdentityModel.Selectors.UserNamePasswordValidator" /> that validates a username and password using <paramref name="provider" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The value of this static property can be supplied as a parameter to one of the constructors for the <xref:System.IdentityModel.Selectors.UserNameSecurityTokenAuthenticator> class.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The value of this static property can be supplied as a parameter to one of the constructors for the <xref:System.IdentityModel.Selectors.UserNameSecurityTokenAuthenticator> class.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -103,11 +97,11 @@
         <summary>Gets a validator that performs no validation on the username and password. As a result, the username and password are always deemed valid.</summary>
         <value>An <see cref="T:System.IdentityModel.Selectors.UserNamePasswordValidator" /> that performs no validation on the username and password.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The value of this static property can be supplied as a parameter to one of the constructors for the <xref:System.IdentityModel.Selectors.UserNameSecurityTokenAuthenticator> class.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The value of this static property can be supplied as a parameter to one of the constructors for the <xref:System.IdentityModel.Selectors.UserNameSecurityTokenAuthenticator> class.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -137,17 +131,10 @@
         <param name="password">The password to validate.</param>
         <summary>When overridden in a derived class, validates the specified username and password.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override the <xref:System.IdentityModel.Selectors.UserNamePasswordValidator.Validate%2A> method to specify how the username and password is validated. If the username and password do not pass validation, then throw a <xref:System.IdentityModel.Tokens.SecurityTokenValidationException>.  
-  
-   
-  
-## Examples  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_usernamevalidator/cs/service.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_usernamevalidator/vb/service.vb" id="Snippet2":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+Override the <xref:System.IdentityModel.Selectors.UserNamePasswordValidator.Validate%2A> method to specify how the username and password is validated. If the username and password do not pass validation, then throw a <xref:System.IdentityModel.Tokens.SecurityTokenValidationException>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Net/HttpWebRequest.xml b/xml/System.Net/HttpWebRequest.xml
index 4fcfc42fc3b..9a2af865a94 100644
--- a/xml/System.Net/HttpWebRequest.xml
+++ b/xml/System.Net/HttpWebRequest.xml
@@ -1899,14 +1899,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
 
 [!INCLUDE [obsolete-notice](~/includes/web-request-obsolete.md)]
 
- The <xref:System.Net.HttpWebRequest.ConnectionGroupName%2A> property enables you to associate a request with a connection group. This is useful when your application makes requests to one server for different users, such as a Web site that retrieves customer information from a database server.
-
-## Examples
- The following code example show how to use user information to form a connection group, assuming that the variables `username`, `password`, and `domain` are set by the application before this code is called.
-
- :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic HttpWebRequest.ConnectionGroupName Example/CPP/source.cpp" id="Snippet1":::
- :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ConnectionGroupName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebRequest.ConnectionGroupName Example/VB/source.vb" id="Snippet1":::
+ The <xref:System.Net.HttpWebRequest.ConnectionGroupName%2A> property enables you to associate a request with a connection group. This is useful when your application makes requests to one server for different users, such as a web site that retrieves customer information from a database server.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/WebRequest.xml b/xml/System.Net/WebRequest.xml
index be6741cf91e..2bcaf58620c 100644
--- a/xml/System.Net/WebRequest.xml
+++ b/xml/System.Net/WebRequest.xml
@@ -2330,15 +2330,6 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
 > [!NOTE]
 >  The <xref:System.Net.WebRequest> class is an `abstract` class. The actual behavior of <xref:System.Net.WebRequest> instances at run time is determined by the descendant class returned by the <xref:System.Net.WebRequest.Create%2A?displayProperty=nameWithType> method. For more information about default values and exceptions, see the documentation for the descendant classes, such as <xref:System.Net.HttpWebRequest> and <xref:System.Net.FileWebRequest>.
 
-
-
-## Examples
- The following example sets the <xref:System.Net.WebRequest.PreAuthenticate%2A> property to `true` so that the <xref:System.Net.NetworkCredential> stored in the <xref:System.Net.WebRequest.Credentials%2A> property will be sent to along with the resource request.
-
- :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/WebRequest_PreAuthenticate/CPP/webrequest_preauthenticate.cpp" id="Snippet1":::
- :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/PreAuthenticate/webrequest_preauthenticate.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_PreAuthenticate/VB/webrequest_preauthenticate.vb" id="Snippet1":::
-
  ]]></format>
         </remarks>
         <exception cref="T:System.NotImplementedException">Any attempt is made to get or set the property, when the property is not overridden in a descendant class.</exception>
diff --git a/xml/System.Runtime.Remoting/RemotingServices.xml b/xml/System.Runtime.Remoting/RemotingServices.xml
index 968974f072f..2e8887623de 100644
--- a/xml/System.Runtime.Remoting/RemotingServices.xml
+++ b/xml/System.Runtime.Remoting/RemotingServices.xml
@@ -672,9 +672,7 @@
 ## Remarks
  The same session ID might be returned for objects in the same application, but this method will never return the same session ID for two objects in different remote applications.
 
- For more information about identifying sessions and session IDs, see ASP.Net [ASP.NET Session State Overview](https://learn.microsoft.com/previous-versions/aspnet/ms178581(v=vs.100)).
-
-
+ For more information about identifying sessions and session IDs, see [ASP.NET Session State Overview](https://learn.microsoft.com/previous-versions/aspnet/ms178581(v=vs.100)).
 
 ## Examples
  The following code example demonstrates how to get the session ID string for the current session.
diff --git a/xml/System.ServiceModel.Security/UserNamePasswordValidationMode.xml b/xml/System.ServiceModel.Security/UserNamePasswordValidationMode.xml
index e5a2f9127e2..1d594306b7f 100644
--- a/xml/System.ServiceModel.Security/UserNamePasswordValidationMode.xml
+++ b/xml/System.ServiceModel.Security/UserNamePasswordValidationMode.xml
@@ -17,18 +17,10 @@
   <Docs>
     <summary>Lists ways to validate in username/password mode.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This enumeration is referenced by <xref:System.ServiceModel.Configuration.UserNameServiceElement>, <xref:System.ServiceModel.Security.ServiceCredentialsSecurityTokenManager>, and <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential>.  
-  
-   
-  
-## Examples  
- This example shows how to set this property.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ueusernamepasswordvalidationmode/cs/service.cs" id="Snippet1":::  
-  
+      <format type="text/markdown"><![CDATA[
+
+This enumeration is referenced by <xref:System.ServiceModel.Configuration.UserNameServiceElement>, <xref:System.ServiceModel.Security.ServiceCredentialsSecurityTokenManager>, and <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential>.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel/WS2007FederationHttpBinding.xml b/xml/System.ServiceModel/WS2007FederationHttpBinding.xml
index 162d28588ea..2d7867dc012 100644
--- a/xml/System.ServiceModel/WS2007FederationHttpBinding.xml
+++ b/xml/System.ServiceModel/WS2007FederationHttpBinding.xml
@@ -17,14 +17,14 @@
   <Docs>
     <summary>A secure and interoperable binding that derives from <see cref="T:System.ServiceModel.WS2007HttpBinding" /> and supports federated security.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Federation is the ability to share identities across multiple enterprises or trust domains for authentication and authorization. It uses the WS-Trust protocol to map the identity representation from one trust domain to another. Federated HTTP binding supports SOAP security as well as mixed-mode security, but it does not support transport security. Services configured with this binding must use the HTTP transport. For more information, see <xref:System.ServiceModel.WSFederationHttpBinding>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Federation is the ability to share identities across multiple enterprises or trust domains for authentication and authorization. It uses the WS-Trust protocol to map the identity representation from one trust domain to another. Federated HTTP binding supports SOAP security as well as mixed-mode security, but it does not support transport security. Services configured with this binding must use the HTTP transport. For more information, see <xref:System.ServiceModel.WSFederationHttpBinding>.
+
 > [!NOTE]
->  When calling a WCF service built with.Net Framework 4.0 from a WCF client application built with .NET Framework 3.5 or earlier, the configuration file generated by svcutil.exe or adding a service reference from Visual Studio will contain the establishSecurityContext attribute in the binding configuration. This attribute is not recognized by the .NET Framework 3.5 runtime and the application will thrown an <xref:System.Configuration.ConfigurationErrorsException> with the message "Unrecognized attribute establishSecurityContext". To workaround this problem, remove the establishSecurityContext attribute from the binding configuration.  
-  
+>  When calling a WCF service built with .NET Framework 4.0 from a WCF client application built with .NET Framework 3.5 or earlier, the configuration file generated by svcutil.exe or adding a service reference from Visual Studio will contain the establishSecurityContext attribute in the binding configuration. This attribute is not recognized by the .NET Framework 3.5 runtime and the application will thrown an <xref:System.Configuration.ConfigurationErrorsException> with the message "Unrecognized attribute establishSecurityContext". To workaround this problem, remove the establishSecurityContext attribute from the binding configuration.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -54,11 +54,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WS2007FederationHttpBinding" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The details of these settings are available from the instance of <xref:System.ServiceModel.FederatedMessageSecurityOverHttp> that is returned by the <xref:System.ServiceModel.WSFederationHttpSecurity.Message%2A> property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The details of these settings are available from the instance of <xref:System.ServiceModel.FederatedMessageSecurityOverHttp> that is returned by the <xref:System.ServiceModel.WSFederationHttpSecurity.Message%2A> property.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -89,11 +89,11 @@
         <param name="securityMode">The value of <see cref="T:System.ServiceModel.WSFederationHttpSecurityMode" /> that specifies the type of security that is used with the SOAP message and for the client.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WS2007FederationHttpBinding" /> class with a specified type of security used by the binding.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of <xref:System.ServiceModel.WSFederationHttpSecurityMode> is <xref:System.ServiceModel.WSFederationHttpSecurityMode.Message> which specifies that integrity, confidentiality, and server and client authentication are provided using SOAP message security. The details of these settings are available from the instance of <xref:System.ServiceModel.FederatedMessageSecurityOverHttp> that is returned by the <xref:System.ServiceModel.WSFederationHttpSecurity.Message%2A> property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of <xref:System.ServiceModel.WSFederationHttpSecurityMode> is <xref:System.ServiceModel.WSFederationHttpSecurityMode.Message> which specifies that integrity, confidentiality, and server and client authentication are provided using SOAP message security. The details of these settings are available from the instance of <xref:System.ServiceModel.FederatedMessageSecurityOverHttp> that is returned by the <xref:System.ServiceModel.WSFederationHttpSecurity.Message%2A> property.
+
  ]]></format>
         </remarks>
       </Docs>