diff --git a/TUnit.Assertions/TUnit.Assertions.props b/TUnit.Assertions/TUnit.Assertions.props
index 5b82565449..6525bb1f7b 100644
--- a/TUnit.Assertions/TUnit.Assertions.props
+++ b/TUnit.Assertions/TUnit.Assertions.props
@@ -1,22 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
 
-    <PropertyGroup>
-        <XunitPackageReferenceFound>false</XunitPackageReferenceFound>
-    </PropertyGroup>
-
-    <Target Name="SetXunitPackageReferenceFound" BeforeTargets="PrepareForBuild">
-        <!-- Filter PackageReference for xunit and xunit.v3 -->
-        <ItemGroup>
-            <_XunitReference Include="@(PackageReference)"
-                Condition="'%(PackageReference.Identity)' == 'xunit' Or '%(PackageReference.Identity)' == 'xunit.v3'" />
-        </ItemGroup>
-        <PropertyGroup>
-            <XunitPackageReferenceFound Condition="'@(_XunitReference)' != ''">true</XunitPackageReferenceFound>
-        </PropertyGroup>
-    </Target>
-
-    <PropertyGroup Condition="'$(XunitPackageReferenceFound)' == 'false' And '$(TUnitAssertionsImplicitUsings)' == ''">
+    <PropertyGroup Condition="'$(TUnitAssertionsImplicitUsings)' == ''">
         <TUnitAssertionsImplicitUsings>true</TUnitAssertionsImplicitUsings>
     </PropertyGroup>
 
diff --git a/TUnit.Core/TUnit.Core.props b/TUnit.Core/TUnit.Core.props
index 4837fcb702..d4248315f1 100644
--- a/TUnit.Core/TUnit.Core.props
+++ b/TUnit.Core/TUnit.Core.props
@@ -1,22 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
 
-    <PropertyGroup>
-        <XunitPackageReferenceFound>false</XunitPackageReferenceFound>
-    </PropertyGroup>
-
-    <Target Name="SetXunitPackageReferenceFound" BeforeTargets="PrepareForBuild">
-        <!-- Filter PackageReference for xunit and xunit.v3 -->
-        <ItemGroup>
-            <_XunitReference Include="@(PackageReference)"
-                Condition="'%(PackageReference.Identity)' == 'xunit' Or '%(PackageReference.Identity)' == 'xunit.v3'" />
-        </ItemGroup>
-        <PropertyGroup>
-            <XunitPackageReferenceFound Condition="'@(_XunitReference)' != ''">true</XunitPackageReferenceFound>
-        </PropertyGroup>
-    </Target>
-
-    <PropertyGroup Condition="'$(XunitPackageReferenceFound)' == 'false'">
+    <PropertyGroup Condition="'$(TUnitImplicitUsings)' == ''">
         <TUnitImplicitUsings>true</TUnitImplicitUsings>
     </PropertyGroup>
 
@@ -34,9 +19,7 @@
     </Target>
 
     <PropertyGroup>
-        <!-- Default to enabling polyfills for older frameworks -->
         <EnableTUnitPolyfills Condition="'$(EnableTUnitPolyfills)' == '' and ('$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFrameworkIdentifier)' == '.NETFramework')">true</EnableTUnitPolyfills>
-        <!-- Use embedded Polyfill attributes to prevent type conflicts across projects -->
         <PolyUseEmbeddedAttribute Condition="'$(PolyUseEmbeddedAttribute)' == ''">true</PolyUseEmbeddedAttribute>
     </PropertyGroup>
 
diff --git a/TUnit.Core/TUnit.Core.targets b/TUnit.Core/TUnit.Core.targets
index 9c9d1416b1..8b3ecd4f80 100644
--- a/TUnit.Core/TUnit.Core.targets
+++ b/TUnit.Core/TUnit.Core.targets
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
 
     <ItemGroup Condition="'$(TUnitImplicitUsings)' == 'true'">