diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e89e060f..c4ef2c74 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -23,14 +23,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <PackageReadmeFile Condition="'$(IsPackable)' == 'true'">README.md</PackageReadmeFile>
-
-    <!--
-      Strong name signing of netstandard assemblies for better cross-runtime compatibility
-
-        Ref: https://docs.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/6.0/strong-name-signing-exceptions#recommended-action
-     -->
     <SignAssembly>true</SignAssembly>
-    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)_SignAssembly.targets</CustomBeforeMicrosoftCommonTargets>
+    <AssemblyOriginatorKeyFile>..\graphql.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(IsPackable)' == 'true'">
diff --git a/src/GraphQLParser.sln b/src/GraphQLParser.sln
index 348de1a5..01e5c236 100644
--- a/src/GraphQLParser.sln
+++ b/src/GraphQLParser.sln
@@ -18,9 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		graphql.snk = graphql.snk
 		..\LICENSE.md = ..\LICENSE.md
 		..\assets\logo.64x64.png = ..\assets\logo.64x64.png
-		public.snk = public.snk
 		..\README.md = ..\README.md
-		_SignAssembly.targets = _SignAssembly.targets
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQLParser.ApiTests", "GraphQLParser.ApiTests\GraphQLParser.ApiTests.csproj", "{6F01D881-DEA2-4259-977B-FF56DD366592}"
diff --git a/src/GraphQLParser/AST/GraphQLName.cs b/src/GraphQLParser/AST/GraphQLName.cs
index b91e3a6c..54c5e69c 100644
--- a/src/GraphQLParser/AST/GraphQLName.cs
+++ b/src/GraphQLParser/AST/GraphQLName.cs
@@ -36,12 +36,9 @@ public string StringValue
     {
         get
         {
-            if (_string == null)
-            {
-                _string = Value.Length == 0
+            _string ??= Value.Length == 0
                     ? string.Empty
                     : (string)Value;
-            }
 
             return _string;
         }
diff --git a/src/GraphQLParser/GraphQLParser.csproj b/src/GraphQLParser/GraphQLParser.csproj
index 949daafb..d4f96057 100644
--- a/src/GraphQLParser/GraphQLParser.csproj
+++ b/src/GraphQLParser/GraphQLParser.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Library containing lexer and parser for GraphQL syntax</Description>
diff --git a/src/_SignAssembly.targets b/src/_SignAssembly.targets
deleted file mode 100644
index 9e747ca3..00000000
--- a/src/_SignAssembly.targets
+++ /dev/null
@@ -1,32 +0,0 @@
-<Project>
-  <!--
-      Strong name signing of netstandard assemblies for better cross-runtime compatibility.
-      
-        Ref: https://docs.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/6.0/strong-name-signing-exceptions#recommended-action
-     -->
-
-  <PropertyGroup Condition="'$(SignAssembly)' == 'true'">
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)graphql.snk</AssemblyOriginatorKeyFile>
-    <PublicKeyToken>e6238258560628ee</PublicKeyToken>
-  </PropertyGroup>
-
-
-  <!--
-    Workaround for: https://github.com/Microsoft/msbuild/issues/1490 (lack of support for public-signing satellites)
-    Delay-signs the satellite assemblies when main assembly is public-signed.
-    
-    Ref: https://github.com/dotnet/project-system/blob/main/eng/imports/StrongName.targets
-  -->
-  <Target Name="PrepareToDelaySignSatelliteAssemblies" BeforeTargets="GenerateSatelliteAssemblies" Condition="'$(MSBuildRuntimeType)' != 'Core' and '$(SignAssembly)' == 'true'">
-    <PropertyGroup>
-      <_DelaySignMainAssembly>$(DelaySign)</_DelaySignMainAssembly>
-      <DelaySign Condition="'$(PublicSign)' == 'true'">true</DelaySign>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="CleanupAfterDelaySigningSatelliteAssemblies" AfterTargets="GenerateSatelliteAssemblies" Condition="'$(MSBuildRuntimeType)' != 'Core' and '$(SignAssembly)' == 'true'">
-    <PropertyGroup>
-      <DelaySign>$(_DelaySignMainAssembly)</DelaySign>
-    </PropertyGroup>
-  </Target>
-</Project>
diff --git a/src/public.snk b/src/public.snk
deleted file mode 100644
index d0b1b2eb..00000000
Binary files a/src/public.snk and /dev/null differ