diff --git a/src/Basque/Mews.Fiscalizations.Basque/Model/Invoice/InvoiceData.cs b/src/Basque/Mews.Fiscalizations.Basque/Model/Invoice/InvoiceData.cs
index 11df7813..9c02bac3 100644
--- a/src/Basque/Mews.Fiscalizations.Basque/Model/Invoice/InvoiceData.cs
+++ b/src/Basque/Mews.Fiscalizations.Basque/Model/Invoice/InvoiceData.cs
@@ -46,7 +46,7 @@ public static Try<InvoiceData, IReadOnlyList<Error>> Create(
         return Try.Aggregate(
             ObjectValidations.NotNull(description),
             items.ToList().ToTry(i => i.Any() && i.Count <= 1000, _ => new Error($"{nameof(items)} count must be in range [1, 1000].")),
-            taxModes.ToTry(t => t.NonEmptyNorNull(), _ => new Error($"{nameof(taxModes)} shouldn't be empty.")),
+            taxModes.ToTry(t => t.NonEmpty(), _ => new Error($"{nameof(taxModes)} shouldn't be empty.")),
             (d, i, t) => new InvoiceData(d, i, totalAmount, t, supportWithheldAmount, tax, transactionDate)
         );
     }
diff --git a/src/Core/Mews.Fiscalizations.Core/Model/Extensions/CollectionExtensions.cs b/src/Core/Mews.Fiscalizations.Core/Model/Extensions/CollectionExtensions.cs
index 4406ad9d..e5b075f0 100644
--- a/src/Core/Mews.Fiscalizations.Core/Model/Extensions/CollectionExtensions.cs
+++ b/src/Core/Mews.Fiscalizations.Core/Model/Extensions/CollectionExtensions.cs
@@ -14,35 +14,6 @@ public static bool IsSequential(this IEnumerable<int> source, int startIndex)
         return source.Select((value, index) => (value, index)).All(x => x.value == startIndex + x.index);
     }
 
-    /// <summary>
-    /// Retuns an empty Enumerable if source is null, otherwise source.
-    /// </summary>
-    public static IEnumerable<TSource> OrEmptyIfNull<TSource>(this IEnumerable<TSource> source)
-    {
-        if (source == null)
-        {
-            return Enumerable.Empty<TSource>();
-        }
-
-        return source;
-    }
-
-    public static bool NonEmptyNorNull<T>(this IEnumerable<T> source)
-    {
-        return source is not null && source.Any();
-    }
-
-    public static bool IsEmptyOrNull<T>(this IEnumerable<T> source)
-    {
-        return source is null || !source.Any();
-    }
-
-    [Pure]
-    public static bool NonEmptyNorNull<T>(this IReadOnlyCollection<T> source)
-    {
-        return source is not null && source.Count > 0;
-    }
-
     [Pure]
     public static bool IsEmptyOrNull<T>(this IReadOnlyCollection<T> source)
     {
@@ -63,7 +34,9 @@ public static Option<T> SafeFirstOption<T>(this IEnumerable<T> source)
             case null:
                 return Option.Empty<T>();
             case IReadOnlyList<T> list:
-                return list.SafeFirstOption();
+                return list.Count == 0
+                    ? Option.Empty<T>()
+                    : Option.Valued(list[0]);
             default:
             {
                 using var enumerator = source.GetEnumerator();
@@ -73,12 +46,4 @@ public static Option<T> SafeFirstOption<T>(this IEnumerable<T> source)
             }
         }
     }
-
-    [Pure]
-    public static Option<T> SafeFirstOption<T>(this IReadOnlyList<T> list)
-    {
-        return list is null || list.Count == 0
-            ? Option.Empty<T>()
-            : Option.Valued(list[0]);
-    }
 }
\ No newline at end of file
diff --git a/src/Italy/Mews.Fiscalizations.Italy/Uniwix/Communication/UniwixClient.cs b/src/Italy/Mews.Fiscalizations.Italy/Uniwix/Communication/UniwixClient.cs
index 0904095d..1d21d725 100644
--- a/src/Italy/Mews.Fiscalizations.Italy/Uniwix/Communication/UniwixClient.cs
+++ b/src/Italy/Mews.Fiscalizations.Italy/Uniwix/Communication/UniwixClient.cs
@@ -46,7 +46,7 @@ public async Task<Try<InvoiceState, ErrorResult>> GetInvoiceStateAsync(string fi
         var url = $"{UniwixBaseUrl}/Invoices/{fileId}";
         var result = await GetAsync<List<InvoiceStateResult>>(url);
 
-        var validatedResult = result.Where(a => a.NonEmptyNorNull(), _ => ErrorResult.Create($"Invoice {fileId} not found.", ErrorType.InvoiceNotFound));
+        var validatedResult = result.Where(a => a is not null && a.NonEmpty(), _ => ErrorResult.Create($"Invoice {fileId} not found.", ErrorType.InvoiceNotFound));
         return validatedResult.Map(r =>
         {
             var state = r.OrderByDescending(s => s.Date).First();
diff --git a/src/Mews.Fiscalizations.All.props b/src/Mews.Fiscalizations.All.props
index 46073070..15719843 100644
--- a/src/Mews.Fiscalizations.All.props
+++ b/src/Mews.Fiscalizations.All.props
@@ -3,6 +3,6 @@
     <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FuncSharp" Version="[8.0.0-preview.1, 9.0)" />
+    <PackageReference Include="FuncSharp" Version="[8.0.0-preview.2, 9.0)" />
   </ItemGroup>
 </Project>
diff --git a/src/Mews.Fiscalizations.All/Mews.Fiscalizations.All.csproj b/src/Mews.Fiscalizations.All/Mews.Fiscalizations.All.csproj
index c4459cad..7f430f53 100644
--- a/src/Mews.Fiscalizations.All/Mews.Fiscalizations.All.csproj
+++ b/src/Mews.Fiscalizations.All/Mews.Fiscalizations.All.csproj
@@ -10,7 +10,7 @@
     <RepositoryUrl>https://github.com/MewsSystems/fiscalizations</RepositoryUrl>
     <Icon>https://raw.githubusercontent.com/msigut/eet/master/receipt.png</Icon>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>25.0.3</PackageVersion>
+    <PackageVersion>25.0.4</PackageVersion>
     <LangVersion>10</LangVersion>
     <ImplicitUsings>true</ImplicitUsings>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>