diff --git a/src/Umbraco.Cms.Api.Common/Extensions/MethodInfoApiCommonExtensions.cs b/src/Umbraco.Cms.Api.Common/Extensions/MethodInfoApiCommonExtensions.cs
index 9d619f5e1c..73ee0470e1 100644
--- a/src/Umbraco.Cms.Api.Common/Extensions/MethodInfoApiCommonExtensions.cs
+++ b/src/Umbraco.Cms.Api.Common/Extensions/MethodInfoApiCommonExtensions.cs
@@ -8,11 +8,11 @@ namespace Umbraco.Extensions;
 public static class MethodInfoApiCommonExtensions
 {
 
-    public static string? GetMapToApiVersionAttributeValue(this MethodInfo methodInfo)
+    public static string GetMapToApiVersionAttributeValue(this MethodInfo methodInfo)
     {
         MapToApiVersionAttribute[] mapToApis = methodInfo.GetCustomAttributes(typeof(MapToApiVersionAttribute), inherit: true).Cast<MapToApiVersionAttribute>().ToArray();
 
-        return string.Join("|", mapToApis.SelectMany(x=>x.Versions));
+        return string.Join("|", mapToApis.SelectMany(x => x.Versions));
     }
 
     public static string? GetMapToApiAttributeValue(this MethodInfo methodInfo)
diff --git a/src/Umbraco.Core/DeliveryApi/ApiContentPathProvider.cs b/src/Umbraco.Core/DeliveryApi/ApiContentPathProvider.cs
index 853f0030ae..231bd496f2 100644
--- a/src/Umbraco.Core/DeliveryApi/ApiContentPathProvider.cs
+++ b/src/Umbraco.Core/DeliveryApi/ApiContentPathProvider.cs
@@ -11,6 +11,6 @@ public class ApiContentPathProvider : IApiContentPathProvider
     public ApiContentPathProvider(IPublishedUrlProvider publishedUrlProvider)
         => _publishedUrlProvider = publishedUrlProvider;
 
-    public virtual string? GetContentPath(IPublishedContent content, string? culture)
+    public virtual string GetContentPath(IPublishedContent content, string? culture)
         => _publishedUrlProvider.GetUrl(content, UrlMode.Relative, culture);
 }
diff --git a/src/Umbraco.Core/Dictionary/UmbracoCultureDictionary.cs b/src/Umbraco.Core/Dictionary/UmbracoCultureDictionary.cs
index 4a59ed9fd4..9c6caba2d5 100644
--- a/src/Umbraco.Core/Dictionary/UmbracoCultureDictionary.cs
+++ b/src/Umbraco.Core/Dictionary/UmbracoCultureDictionary.cs
@@ -81,7 +81,7 @@ internal sealed class DefaultCultureDictionary : ICultureDictionary
     /// </summary>
     /// <param name="key"></param>
     /// <returns></returns>
-    public string? this[string key]
+    public string this[string key]
     {
         get
         {
diff --git a/src/Umbraco.Core/Extensions/UriExtensions.cs b/src/Umbraco.Core/Extensions/UriExtensions.cs
index 6d3b47141f..b03d3e0951 100644
--- a/src/Umbraco.Core/Extensions/UriExtensions.cs
+++ b/src/Umbraco.Core/Extensions/UriExtensions.cs
@@ -181,7 +181,7 @@ public static class UriExtensions
     public static Uri WithoutPort(this Uri uri) =>
         new Uri(uri.GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped));
 
-    private static string? GetSafeQuery(this Uri uri)
+    private static string GetSafeQuery(this Uri uri)
     {
         if (uri.IsAbsoluteUri)
         {
diff --git a/src/Umbraco.Core/Models/DictionaryItemExtensions.cs b/src/Umbraco.Core/Models/DictionaryItemExtensions.cs
index 0c46ce02ef..84f6b74fc0 100644
--- a/src/Umbraco.Core/Models/DictionaryItemExtensions.cs
+++ b/src/Umbraco.Core/Models/DictionaryItemExtensions.cs
@@ -10,7 +10,7 @@ public static class DictionaryItemExtensions
     /// <param name="d"></param>
     /// <param name="isoCode"></param>
     /// <returns></returns>
-    public static string? GetTranslatedValue(this IDictionaryItem d, string isoCode)
+    public static string GetTranslatedValue(this IDictionaryItem d, string isoCode)
     {
         IDictionaryTranslation? trans = d.Translations.FirstOrDefault(x => x.LanguageIsoCode == isoCode);
         return trans == null ? string.Empty : trans.Value;
diff --git a/src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs b/src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs
index 77b6253178..b0018dc179 100644
--- a/src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs
+++ b/src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs
@@ -25,7 +25,7 @@ public struct ReadOnlyContentBaseAdapter : IReadOnlyContentBase
 
     public int Level => _content.Level;
 
-    public string? Path => _content.Path;
+    public string Path => _content.Path;
 
     public int SortOrder => _content.SortOrder;
 
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index 1774c8db89..f1f4064847 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -143,7 +143,7 @@ public static class UserExtensions
     /// <summary>
     ///     Calculate start nodes, combining groups' and user's, and excluding what's in the bin
     /// </summary>
-    public static int[]? CalculateAllowedLanguageIds(this IUser user, ILocalizationService localizationService)
+    public static int[] CalculateAllowedLanguageIds(this IUser user, ILocalizationService localizationService)
     {
         var hasAccessToAllLanguages = user.Groups.Any(x => x.HasAccessToAllLanguages);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs
index 1172512228..e1106c57f8 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs
@@ -52,7 +52,7 @@ public interface IContentRepository<in TId, TEntity> : IReadWriteQueryRepository
     /// <summary>
     ///     Gets the recycle bin content.
     /// </summary>
-    IEnumerable<TEntity>? GetRecycleBin();
+    IEnumerable<TEntity> GetRecycleBin();
 
     /// <summary>
     ///     Gets the count of content items of a given content type.
diff --git a/src/Umbraco.Core/PropertyEditors/TextStringValueConverter.cs b/src/Umbraco.Core/PropertyEditors/TextStringValueConverter.cs
index 8fe15645e1..0fb6b3a13f 100644
--- a/src/Umbraco.Core/PropertyEditors/TextStringValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/TextStringValueConverter.cs
@@ -57,6 +57,6 @@ public class TextStringValueConverter : PropertyValueConverterBase, IDeliveryApi
     public Type GetDeliveryApiPropertyValueType(IPublishedPropertyType propertyType)
         => GetPropertyValueType(propertyType);
 
-    public object ConvertIntermediateToDeliveryApiObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object? inter, bool preview, bool expanding)
+    public object? ConvertIntermediateToDeliveryApiObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object? inter, bool preview, bool expanding)
         => ConvertIntermediateToObject(owner, propertyType, referenceCacheLevel, inter, preview);
 }
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/BigintValueTypeConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/BigintValueTypeConverter.cs
index 102236350a..0e232bdc77 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/BigintValueTypeConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/BigintValueTypeConverter.cs
@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
index f1deef76fb..472bc6aee3 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
@@ -15,7 +15,7 @@ public class DatePickerValueConverter : PropertyValueConverterBase
     public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
         => PropertyCacheLevel.Element;
 
-    public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
+    public override object? ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
         => ParseDateTimeValue(source);
 
     internal static DateTime ParseDateTimeValue(object? source)
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/DateTimeValueTypeConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DateTimeValueTypeConverter.cs
index f9c8caa50c..64dd9cb258 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/DateTimeValueTypeConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/DateTimeValueTypeConverter.cs
@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 
 namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs
index d499efcd4f..0570f1e1a5 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueConverter.cs
@@ -15,7 +15,7 @@ public class DecimalValueConverter : PropertyValueConverterBase
     public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
         => PropertyCacheLevel.Element;
 
-    public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
+    public override object? ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
         => ParseDecimalValue(source);
 
     internal static decimal ParseDecimalValue(object? source)
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueTypeConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueTypeConverter.cs
index 37ab859994..3dd66185e1 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueTypeConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/DecimalValueTypeConverter.cs
@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 
 namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
index 3e2f5e73c9..7acc43cdbe 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs
@@ -16,7 +16,7 @@ public class FlexibleDropdownPropertyValueConverter : PropertyValueConverterBase
     public override bool IsConverter(IPublishedPropertyType propertyType) =>
         propertyType.EditorAlias.Equals(Constants.PropertyEditors.Aliases.DropDownListFlexible);
 
-    public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
+    public override object? ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
     {
         if (source is null)
         {
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
index f0be275436..c57ee85f1d 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
@@ -15,7 +15,7 @@ public class IntegerValueConverter : PropertyValueConverterBase
     public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
         => PropertyCacheLevel.Element;
 
-    public override object ConvertSourceToIntermediate(
+    public override object? ConvertSourceToIntermediate(
         IPublishedElement owner,
         IPublishedPropertyType propertyType,
         object? source,
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueTypeConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueTypeConverter.cs
index 78789b3953..d8ae0e25a0 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueTypeConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueTypeConverter.cs
@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs
index dc82051928..e95d85ebd5 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using Umbraco.Cms.Core.Models.PublishedContent;
 
 namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
@@ -43,7 +43,7 @@ public class LabelValueConverter : PropertyValueConverterBase
     public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
         => PropertyCacheLevel.Element;
 
-    public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
+    public override object? ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
     {
         LabelConfiguration? valueType =
             ConfigurationEditor.ConfigurationAs<LabelConfiguration>(propertyType.DataType.ConfigurationObject);
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs
index 075a8b8100..4276e4ae33 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/MemberGroupPickerValueConverter.cs
@@ -22,7 +22,7 @@ public class MemberGroupPickerValueConverter : PropertyValueConverterBase, IDeli
     public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
         => PropertyCacheLevel.Element;
 
-    public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview) => source?.ToString() ?? string.Empty;
+    public override object? ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview) => source?.ToString() ?? string.Empty;
 
     public PropertyCacheLevel GetDeliveryApiPropertyCacheLevel(IPublishedPropertyType propertyType) => GetPropertyCacheLevel(propertyType);
 
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
index 23241e8cd9..9908df6b35 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 
 namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 
@@ -16,7 +16,7 @@ public class MultipleTextStringValueConverter : PropertyValueConverterBase
     public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
         => PropertyCacheLevel.Element;
 
-    public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
+    public override object? ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview)
     {
         // data is (both in database and xml):
         // <keyFeatureList>
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
index 03e7c1092a..eab4a6b3a1 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs
@@ -32,7 +32,7 @@ public class SliderValueConverter : PropertyValueConverterBase
         => PropertyCacheLevel.Element;
 
     /// <inheritdoc />
-    public override object? ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel cacheLevel, object? source, bool preview)
+    public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel cacheLevel, object? source, bool preview)
     {
         bool isRange = IsRange(propertyType);
 
diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs
index a48b717305..75af9dbad6 100644
--- a/src/Umbraco.Core/Services/IMediaService.cs
+++ b/src/Umbraco.Core/Services/IMediaService.cs
@@ -235,7 +235,7 @@ public interface IMediaService : IContentServiceBase<IMedia>
     /// </summary>
     /// <param name="level">The level to retrieve Media from</param>
     /// <returns>An Enumerable list of <see cref="IMedia" /> objects</returns>
-    IEnumerable<IMedia>? GetByLevel(int level);
+    IEnumerable<IMedia> GetByLevel(int level);
 
     /// <summary>
     ///     Gets a specific version of an <see cref="IMedia" /> item.
diff --git a/src/Umbraco.Core/Services/IMemberService.cs b/src/Umbraco.Core/Services/IMemberService.cs
index c44095a40f..8de0f43e11 100644
--- a/src/Umbraco.Core/Services/IMemberService.cs
+++ b/src/Umbraco.Core/Services/IMemberService.cs
@@ -385,7 +385,7 @@ public interface IMemberService : IMembershipMemberService, IContentServiceBase<
     /// <returns>
     ///     <see cref="IEnumerable{IMember}" />
     /// </returns>
-    IEnumerable<IMember>? GetMembersByPropertyValue(
+    IEnumerable<IMember> GetMembersByPropertyValue(
         string propertyTypeAlias,
         string value,
         StringPropertyMatchType matchType = StringPropertyMatchType.Exact);
@@ -402,7 +402,7 @@ public interface IMemberService : IMembershipMemberService, IContentServiceBase<
     /// <returns>
     ///     <see cref="IEnumerable{IMember}" />
     /// </returns>
-    IEnumerable<IMember>? GetMembersByPropertyValue(string propertyTypeAlias, int value, ValuePropertyMatchType matchType = ValuePropertyMatchType.Exact);
+    IEnumerable<IMember> GetMembersByPropertyValue(string propertyTypeAlias, int value, ValuePropertyMatchType matchType = ValuePropertyMatchType.Exact);
 
     /// <summary>
     ///     Gets a list of Members based on a property search
@@ -412,7 +412,7 @@ public interface IMemberService : IMembershipMemberService, IContentServiceBase<
     /// <returns>
     ///     <see cref="IEnumerable{IMember}" />
     /// </returns>
-    IEnumerable<IMember>? GetMembersByPropertyValue(string propertyTypeAlias, bool value);
+    IEnumerable<IMember> GetMembersByPropertyValue(string propertyTypeAlias, bool value);
 
     /// <summary>
     ///     Gets a list of Members based on a property search
@@ -426,7 +426,7 @@ public interface IMemberService : IMembershipMemberService, IContentServiceBase<
     /// <returns>
     ///     <see cref="IEnumerable{IMember}" />
     /// </returns>
-    IEnumerable<IMember>? GetMembersByPropertyValue(string propertyTypeAlias, DateTime value, ValuePropertyMatchType matchType = ValuePropertyMatchType.Exact);
+    IEnumerable<IMember> GetMembersByPropertyValue(string propertyTypeAlias, DateTime value, ValuePropertyMatchType matchType = ValuePropertyMatchType.Exact);
 
     /// <summary>
     /// Saves only the properties related to login for the member, using an optimized, non-locking update.
diff --git a/src/Umbraco.Core/Services/IServerRegistrationService.cs b/src/Umbraco.Core/Services/IServerRegistrationService.cs
index 4a08492079..376376273b 100644
--- a/src/Umbraco.Core/Services/IServerRegistrationService.cs
+++ b/src/Umbraco.Core/Services/IServerRegistrationService.cs
@@ -35,7 +35,7 @@ public interface IServerRegistrationService
     ///     <paramref name="refresh" /> parameter to force a cache refresh and reload active servers
     ///     from the database.
     /// </remarks>
-    IEnumerable<IServerRegistration>? GetActiveServers(bool refresh = false);
+    IEnumerable<IServerRegistration> GetActiveServers(bool refresh = false);
 
     /// <summary>
     ///     Return all servers (active and inactive).
diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs
index 2ff78811f3..a782ef0db9 100644
--- a/src/Umbraco.Core/Services/MediaService.cs
+++ b/src/Umbraco.Core/Services/MediaService.cs
@@ -510,7 +510,7 @@ namespace Umbraco.Cms.Core.Services
         /// <param name="level">The level to retrieve Media from</param>
         /// <returns>An Enumerable list of <see cref="IMedia"/> objects</returns>
         /// <remarks>Contrary to most methods, this method filters out trashed media items.</remarks>
-        public IEnumerable<IMedia>? GetByLevel(int level)
+        public IEnumerable<IMedia> GetByLevel(int level)
         {
             using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true);
             scope.ReadLock(Constants.Locks.MediaTree);
diff --git a/src/Umbraco.Core/Services/MemberContentEditingService.cs b/src/Umbraco.Core/Services/MemberContentEditingService.cs
index 720ad80d62..e9da7f545d 100644
--- a/src/Umbraco.Core/Services/MemberContentEditingService.cs
+++ b/src/Umbraco.Core/Services/MemberContentEditingService.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Extensions;
diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs
index 588eefcc96..4186739714 100644
--- a/src/Umbraco.Core/Services/MemberService.cs
+++ b/src/Umbraco.Core/Services/MemberService.cs
@@ -676,7 +676,7 @@ namespace Umbraco.Cms.Core.Services
         /// <param name="value"><see cref="string"/> Value to match</param>
         /// <param name="matchType">The type of match to make as <see cref="StringPropertyMatchType"/>. Default is <see cref="StringPropertyMatchType.Exact"/></param>
         /// <returns><see cref="IEnumerable{IMember}"/></returns>
-        public IEnumerable<IMember>? GetMembersByPropertyValue(string propertyTypeAlias, string value, StringPropertyMatchType matchType = StringPropertyMatchType.Exact)
+        public IEnumerable<IMember> GetMembersByPropertyValue(string propertyTypeAlias, string value, StringPropertyMatchType matchType = StringPropertyMatchType.Exact)
         {
             using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true);
             scope.ReadLock(Constants.Locks.MemberTree);
@@ -710,7 +710,7 @@ namespace Umbraco.Cms.Core.Services
         /// <param name="value"><see cref="int"/> Value to match</param>
         /// <param name="matchType">The type of match to make as <see cref="StringPropertyMatchType"/>. Default is <see cref="StringPropertyMatchType.Exact"/></param>
         /// <returns><see cref="IEnumerable{IMember}"/></returns>
-        public IEnumerable<IMember>? GetMembersByPropertyValue(string propertyTypeAlias, int value, ValuePropertyMatchType matchType = ValuePropertyMatchType.Exact)
+        public IEnumerable<IMember> GetMembersByPropertyValue(string propertyTypeAlias, int value, ValuePropertyMatchType matchType = ValuePropertyMatchType.Exact)
         {
             using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true);
             scope.ReadLock(Constants.Locks.MemberTree);
@@ -746,7 +746,7 @@ namespace Umbraco.Cms.Core.Services
         /// <param name="propertyTypeAlias">Alias of the PropertyType to search for</param>
         /// <param name="value"><see cref="bool"/> Value to match</param>
         /// <returns><see cref="IEnumerable{IMember}"/></returns>
-        public IEnumerable<IMember>? GetMembersByPropertyValue(string propertyTypeAlias, bool value)
+        public IEnumerable<IMember> GetMembersByPropertyValue(string propertyTypeAlias, bool value)
         {
             using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true);
             scope.ReadLock(Constants.Locks.MemberTree);
@@ -762,7 +762,7 @@ namespace Umbraco.Cms.Core.Services
         /// <param name="value"><see cref="System.DateTime"/> Value to match</param>
         /// <param name="matchType">The type of match to make as <see cref="StringPropertyMatchType"/>. Default is <see cref="StringPropertyMatchType.Exact"/></param>
         /// <returns><see cref="IEnumerable{IMember}"/></returns>
-        public IEnumerable<IMember>? GetMembersByPropertyValue(string propertyTypeAlias, DateTime value, ValuePropertyMatchType matchType = ValuePropertyMatchType.Exact)
+        public IEnumerable<IMember> GetMembersByPropertyValue(string propertyTypeAlias, DateTime value, ValuePropertyMatchType matchType = ValuePropertyMatchType.Exact)
         {
             using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true);
             scope.ReadLock(Constants.Locks.MemberTree);
diff --git a/src/Umbraco.Core/Services/ServerRegistrationService.cs b/src/Umbraco.Core/Services/ServerRegistrationService.cs
index 070e9e8e1f..8637886022 100644
--- a/src/Umbraco.Core/Services/ServerRegistrationService.cs
+++ b/src/Umbraco.Core/Services/ServerRegistrationService.cs
@@ -138,7 +138,7 @@ public sealed class ServerRegistrationService : RepositoryService, IServerRegist
     ///     <paramref name="refresh" /> parameter to force a cache refresh and reload active servers
     ///     from the database.
     /// </remarks>
-    public IEnumerable<IServerRegistration>? GetActiveServers(bool refresh = false) =>
+    public IEnumerable<IServerRegistration> GetActiveServers(bool refresh = false) =>
         GetServers(refresh).Where(x => x.IsActive);
 
     /// <summary>
diff --git a/src/Umbraco.Core/Webhooks/Events/Content/ContentCopiedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Content/ContentCopiedWebhookEvent.cs
index b174988a09..a36c1fae64 100644
--- a/src/Umbraco.Core/Webhooks/Events/Content/ContentCopiedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Content/ContentCopiedWebhookEvent.cs
@@ -24,7 +24,7 @@ public class ContentCopiedWebhookEvent : WebhookEventBase<ContentCopiedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentCopied;
 
-    public override object? ConvertNotificationToRequestPayload(ContentCopiedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentCopiedNotification notification)
     {
         return new
         {
diff --git a/src/Umbraco.Core/Webhooks/Events/Content/ContentDeletedVersionsWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Content/ContentDeletedVersionsWebhookEvent.cs
index 2124e7215c..37a7048fd5 100644
--- a/src/Umbraco.Core/Webhooks/Events/Content/ContentDeletedVersionsWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Content/ContentDeletedVersionsWebhookEvent.cs
@@ -29,7 +29,7 @@ public class ContentDeletedVersionsWebhookEvent : WebhookEventBase<ContentDelete
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentDeletedVersions;
 
-    public override object? ConvertNotificationToRequestPayload(ContentDeletedVersionsNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentDeletedVersionsNotification notification)
     {
         return new
         {
diff --git a/src/Umbraco.Core/Webhooks/Events/Content/ContentEmptiedRecycleBinWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Content/ContentEmptiedRecycleBinWebhookEvent.cs
index aba413b96b..bc344528d3 100644
--- a/src/Umbraco.Core/Webhooks/Events/Content/ContentEmptiedRecycleBinWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Content/ContentEmptiedRecycleBinWebhookEvent.cs
@@ -34,6 +34,6 @@ public class ContentEmptiedRecycleBinWebhookEvent : WebhookEventContentBase<Cont
     protected override IEnumerable<IContent> GetEntitiesFromNotification(ContentEmptiedRecycleBinNotification notification) =>
         notification.DeletedEntities;
 
-    protected override object? ConvertEntityToRequestPayload(IContent entity)
+    protected override object ConvertEntityToRequestPayload(IContent entity)
         => new DefaultPayloadModel { Id = entity.Key };
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Content/ContentMovedToRecycleBinWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Content/ContentMovedToRecycleBinWebhookEvent.cs
index d91c09eb9b..f7e45df629 100644
--- a/src/Umbraco.Core/Webhooks/Events/Content/ContentMovedToRecycleBinWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Content/ContentMovedToRecycleBinWebhookEvent.cs
@@ -25,6 +25,6 @@ public class ContentMovedToRecycleBinWebhookEvent : WebhookEventBase<ContentMove
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentMovedToRecycleBin;
 
-    public override object? ConvertNotificationToRequestPayload(ContentMovedToRecycleBinNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentMovedToRecycleBinNotification notification)
         => notification.MoveInfoCollection.Select(moveInfo => new DefaultPayloadModel { Id = moveInfo.Entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Content/ContentMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Content/ContentMovedWebhookEvent.cs
index 681fb13cab..61137b85c3 100644
--- a/src/Umbraco.Core/Webhooks/Events/Content/ContentMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Content/ContentMovedWebhookEvent.cs
@@ -25,6 +25,6 @@ public class ContentMovedWebhookEvent : WebhookEventBase<ContentMovedNotificatio
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentMoved;
 
-    public override object? ConvertNotificationToRequestPayload(ContentMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentMovedNotification notification)
         => notification.MoveInfoCollection.Select(moveInfo => new DefaultPayloadModel { Id = moveInfo.Entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Content/ContentSortedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Content/ContentSortedWebhookEvent.cs
index 0da7d486b8..7aef1b6b22 100644
--- a/src/Umbraco.Core/Webhooks/Events/Content/ContentSortedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Content/ContentSortedWebhookEvent.cs
@@ -35,7 +35,7 @@ public class ContentSortedWebhookEvent : WebhookEventBase<ContentSortedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentSorted;
 
-    public override object? ConvertNotificationToRequestPayload(ContentSortedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentSortedNotification notification)
         => notification.SortedEntities
             .OrderBy(entity => entity.SortOrder)
             .Select(entity => new
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeChangedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeChangedWebhookEvent.cs
index b6b61fb62e..0c4a56d502 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeChangedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeChangedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class DocumentTypeChangedWebhookEvent : WebhookEventBase<ContentTypeChang
 
     public override string Alias => Constants.WebhookEvents.Aliases.DocumentTypeChanged;
 
-    public override object? ConvertNotificationToRequestPayload(ContentTypeChangedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentTypeChangedNotification notification)
         => notification.Changes.Select(contentTypeChange => new
         {
             Id = contentTypeChange.Item.Key,
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeDeletedWebhookEvent.cs
index 3763b2e4f2..a93eb777ed 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class DocumentTypeDeletedWebhookEvent : WebhookEventBase<ContentTypeDelet
 
     public override string Alias => Constants.WebhookEvents.Aliases.DocumentTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(ContentTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentTypeDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeMovedWebhookEvent.cs
index b644acab25..0f93cffc84 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeMovedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class DocumentTypeMovedWebhookEvent : WebhookEventBase<ContentTypeMovedNo
 
     public override string Alias => Constants.WebhookEvents.Aliases.DocumentTypeMoved;
 
-    public override object? ConvertNotificationToRequestPayload(ContentTypeMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentTypeMovedNotification notification)
         => notification.MoveInfoCollection.Select(moveEvent => new
         {
             Id = moveEvent.Entity.Key,
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeSavedWebhookEvent.cs
index 400a0393b5..e3934a9a03 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/DocumentTypeSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class DocumentTypeSavedWebhookEvent : WebhookEventBase<ContentTypeSavedNo
 
     public override string Alias => Constants.WebhookEvents.Aliases.DocumentTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(ContentTypeSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentTypeSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeChangedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeChangedWebhookEvent.cs
index aa5969952d..0b16c6a9ce 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeChangedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeChangedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class MediaTypeChangedWebhookEvent : WebhookEventBase<MediaTypeChangedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.MediaTypeChanged;
 
-    public override object? ConvertNotificationToRequestPayload(MediaTypeChangedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MediaTypeChangedNotification notification)
         => notification.Changes.Select(contentTypeChange => new
         {
             Id = contentTypeChange.Item.Key,
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeDeletedWebhookEvent.cs
index aa0a2d4e37..c80ff8b7ec 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class MediaTypeDeletedWebhookEvent : WebhookEventBase<MediaTypeDeletedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.MediaTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(MediaTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MediaTypeDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeMovedWebhookEvent.cs
index df8b5b5ebc..d50ab40e56 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeMovedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class MediaTypeMovedWebhookEvent : WebhookEventBase<MediaTypeMovedNotific
 
     public override string Alias => Constants.WebhookEvents.Aliases.MediaTypeMoved;
 
-    public override object? ConvertNotificationToRequestPayload(MediaTypeMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MediaTypeMovedNotification notification)
         => notification.MoveInfoCollection.Select(moveEvent => new
         {
             Id = moveEvent.Entity.Key,
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeSavedWebhookEvent.cs
index dc223088c8..6108256282 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/MediaTypeSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class MediaTypeSavedWebhookEvent : WebhookEventBase<MediaTypeSavedNotific
 
     public override string Alias => Constants.WebhookEvents.Aliases.MediaTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(MediaTypeSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MediaTypeSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeChangedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeChangedWebhookEvent.cs
index 2ebcd06dd5..12509a5f25 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeChangedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeChangedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class MemberTypeChangedWebhookEvent : WebhookEventBase<MemberTypeChangedN
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberTypeChanged;
 
-    public override object? ConvertNotificationToRequestPayload(MemberTypeChangedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberTypeChangedNotification notification)
         => notification.Changes.Select(contentTypeChange => new
         {
             Id = contentTypeChange.Item.Key,
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeDeletedWebhookEvent.cs
index 2e6f6cd857..992ed5a77a 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class MemberTypeDeletedWebhookEvent : WebhookEventBase<MemberTypeDeletedN
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(MemberTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberTypeDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeMovedWebhookEvent.cs
index b6c4915fc3..e762f1f870 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeMovedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class MemberTypeMovedWebhookEvent : WebhookEventBase<MemberTypeMovedNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberTypeMoved;
 
-    public override object? ConvertNotificationToRequestPayload(MemberTypeMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberTypeMovedNotification notification)
         => notification.MoveInfoCollection.Select(moveEvent => new
         {
             Id = moveEvent.Entity.Key,
diff --git a/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeSavedWebhookEvent.cs
index 2cc2fd065c..2f1a95095e 100644
--- a/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/ContentType/MemberTypeSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class MemberTypeSavedWebhookEvent : WebhookEventBase<MemberTypeSavedNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(MemberTypeSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberTypeSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeDeletedWebhookEvent.cs
index 0ce41e66c7..b20d4aa7f1 100644
--- a/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class DataTypeDeletedWebhookEvent : WebhookEventBase<DataTypeDeletedNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.DataTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(DataTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DataTypeDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeMovedWebhookEvent.cs
index f2569ce705..15838a7a69 100644
--- a/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeMovedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class DataTypeMovedWebhookEvent : WebhookEventBase<DataTypeMovedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.DataTypeMoved;
 
-    public override object? ConvertNotificationToRequestPayload(DataTypeMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DataTypeMovedNotification notification)
         => notification.MoveInfoCollection.Select(moveEvent => new
         {
             Id = moveEvent.Entity.Key,
diff --git a/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeSavedWebhookEvent.cs
index dd7a88741c..65c8a72c7d 100644
--- a/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/DataType/DataTypeSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class DataTypeSavedWebhookEvent : WebhookEventBase<DataTypeSavedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.DataTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(DataTypeSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DataTypeSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Dictionary/DictionaryItemDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Dictionary/DictionaryItemDeletedWebhookEvent.cs
index 6dcfc926b8..b6ee34e882 100644
--- a/src/Umbraco.Core/Webhooks/Events/Dictionary/DictionaryItemDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Dictionary/DictionaryItemDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class DictionaryItemDeletedWebhookEvent : WebhookEventBase<DictionaryItem
 
     public override string Alias => Constants.WebhookEvents.Aliases.DictionaryItemDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(DictionaryItemDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DictionaryItemDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Dictionary/DictionaryItemSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Dictionary/DictionaryItemSavedWebhookEvent.cs
index 9a39525a6d..f952c85a50 100644
--- a/src/Umbraco.Core/Webhooks/Events/Dictionary/DictionaryItemSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Dictionary/DictionaryItemSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class DictionaryItemSavedWebhookEvent : WebhookEventBase<DictionaryItemSa
 
     public override string Alias => Constants.WebhookEvents.Aliases.DictionaryItemSaved;
 
-    public override object? ConvertNotificationToRequestPayload(DictionaryItemSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DictionaryItemSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Domain/DomainDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Domain/DomainDeletedWebhookEvent.cs
index 46d61d0fcf..1026d2f31e 100644
--- a/src/Umbraco.Core/Webhooks/Events/Domain/DomainDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Domain/DomainDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class DomainDeletedWebhookEvent : WebhookEventBase<DomainDeletedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.DomainDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(DomainDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DomainDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Domain/DomainSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Domain/DomainSavedWebhookEvent.cs
index 6971536d8c..bd86be3b77 100644
--- a/src/Umbraco.Core/Webhooks/Events/Domain/DomainSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Domain/DomainSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class DomainSavedWebhookEvent : WebhookEventBase<DomainSavedNotification>
 
     public override string Alias => Constants.WebhookEvents.Aliases.DomainSaved;
 
-    public override object? ConvertNotificationToRequestPayload(DomainSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DomainSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/File/PartialViewDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/File/PartialViewDeletedWebhookEvent.cs
index b7938dd1c0..16ea3930bf 100644
--- a/src/Umbraco.Core/Webhooks/Events/File/PartialViewDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/File/PartialViewDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class PartialViewDeletedWebhookEvent : WebhookEventBase<PartialViewDelete
 
     public override string Alias => Constants.WebhookEvents.Aliases.PartialViewDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(PartialViewDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(PartialViewDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/File/PartialViewSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/File/PartialViewSavedWebhookEvent.cs
index ad45753f77..94f2966ea6 100644
--- a/src/Umbraco.Core/Webhooks/Events/File/PartialViewSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/File/PartialViewSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class PartialViewSavedWebhookEvent : WebhookEventBase<PartialViewSavedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.PartialViewSaved;
 
-    public override object? ConvertNotificationToRequestPayload(PartialViewSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(PartialViewSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/File/ScriptDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/File/ScriptDeletedWebhookEvent.cs
index e28181ab15..13470e8c2c 100644
--- a/src/Umbraco.Core/Webhooks/Events/File/ScriptDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/File/ScriptDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class ScriptDeletedWebhookEvent : WebhookEventBase<ScriptDeletedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.ScriptDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(ScriptDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ScriptDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/File/ScriptSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/File/ScriptSavedWebhookEvent.cs
index 7029354a3d..121f81b5e4 100644
--- a/src/Umbraco.Core/Webhooks/Events/File/ScriptSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/File/ScriptSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class ScriptSavedWebhookEvent : WebhookEventBase<ScriptSavedNotification>
 
     public override string Alias => Constants.WebhookEvents.Aliases.ScriptSaved;
 
-    public override object? ConvertNotificationToRequestPayload(ScriptSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ScriptSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/File/StylesheetDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/File/StylesheetDeletedWebhookEvent.cs
index fb7acb3b19..d7dee29258 100644
--- a/src/Umbraco.Core/Webhooks/Events/File/StylesheetDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/File/StylesheetDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class StylesheetDeletedWebhookEvent : WebhookEventBase<StylesheetDeletedN
 
     public override string Alias => Constants.WebhookEvents.Aliases.StylesheetDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(StylesheetDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(StylesheetDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/File/StylesheetSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/File/StylesheetSavedWebhookEvent.cs
index d80825883a..9217b8a7d7 100644
--- a/src/Umbraco.Core/Webhooks/Events/File/StylesheetSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/File/StylesheetSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class StylesheetSavedWebhookEvent : WebhookEventBase<StylesheetSavedNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.StylesheetSaved;
 
-    public override object? ConvertNotificationToRequestPayload(StylesheetSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(StylesheetSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/File/TemplateDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/File/TemplateDeletedWebhookEvent.cs
index f935b82bf2..029870fd0f 100644
--- a/src/Umbraco.Core/Webhooks/Events/File/TemplateDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/File/TemplateDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class TemplateDeletedWebhookEvent : WebhookEventBase<TemplateDeletedNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.TemplateDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(TemplateDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(TemplateDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/File/TemplateSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/File/TemplateSavedWebhookEvent.cs
index fe3ab9da3d..86aae3a321 100644
--- a/src/Umbraco.Core/Webhooks/Events/File/TemplateSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/File/TemplateSavedWebhookEvent.cs
@@ -21,7 +21,7 @@ public class TemplateSavedWebhookEvent : WebhookEventBase<TemplateSavedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.TemplateSaved;
 
-    public override object? ConvertNotificationToRequestPayload(TemplateSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(TemplateSavedNotification notification)
         => notification.SavedEntities.Select(entity => new
         {
             Id = entity.Key,
diff --git a/src/Umbraco.Core/Webhooks/Events/HealthCheck/HealthCheckCompletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/HealthCheck/HealthCheckCompletedWebhookEvent.cs
index c5518c6f00..b902aa6ab7 100644
--- a/src/Umbraco.Core/Webhooks/Events/HealthCheck/HealthCheckCompletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/HealthCheck/HealthCheckCompletedWebhookEvent.cs
@@ -15,7 +15,7 @@ public class HealthCheckCompletedWebhookEvent : WebhookEventBase<HealthCheckComp
 
     public override string Alias => Constants.WebhookEvents.Aliases.HealthCheckCompleted;
 
-    public override object? ConvertNotificationToRequestPayload(HealthCheckCompletedNotification notification) =>
+    public override object ConvertNotificationToRequestPayload(HealthCheckCompletedNotification notification) =>
         new
         {
             notification.HealthCheckResults.AllChecksSuccessful,
diff --git a/src/Umbraco.Core/Webhooks/Events/Language/LanguageDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Language/LanguageDeletedWebhookEvent.cs
index 1470153525..8211577bd6 100644
--- a/src/Umbraco.Core/Webhooks/Events/Language/LanguageDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Language/LanguageDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class LanguageDeletedWebhookEvent : WebhookEventBase<LanguageDeletedNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.LanguageDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(LanguageDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(LanguageDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Language/LanguageSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Language/LanguageSavedWebhookEvent.cs
index 811c348dd6..f8d39dc7cc 100644
--- a/src/Umbraco.Core/Webhooks/Events/Language/LanguageSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Language/LanguageSavedWebhookEvent.cs
@@ -21,7 +21,7 @@ public class LanguageSavedWebhookEvent : WebhookEventBase<LanguageSavedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.LanguageSaved;
 
-    public override object? ConvertNotificationToRequestPayload(LanguageSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(LanguageSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
 
diff --git a/src/Umbraco.Core/Webhooks/Events/Member/AssignedMemberRolesWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Member/AssignedMemberRolesWebhookEvent.cs
index b99d33c8de..c1a65a14a5 100644
--- a/src/Umbraco.Core/Webhooks/Events/Member/AssignedMemberRolesWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Member/AssignedMemberRolesWebhookEvent.cs
@@ -25,7 +25,7 @@ public class AssignedMemberRolesWebhookEvent : WebhookEventBase<AssignedMemberRo
 
     public override string Alias => Constants.WebhookEvents.Aliases.AssignedMemberRoles;
 
-    public override object? ConvertNotificationToRequestPayload(AssignedMemberRolesNotification notification)
+    public override object ConvertNotificationToRequestPayload(AssignedMemberRolesNotification notification)
         => new
         {
             Ids = notification.MemberIds.Select(id => _idKeyMap.GetKeyForId(id, UmbracoObjectTypes.Member).Result),
diff --git a/src/Umbraco.Core/Webhooks/Events/Member/ExportedMemberWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Member/ExportedMemberWebhookEvent.cs
index 24a0b7a3b9..3f325dba34 100644
--- a/src/Umbraco.Core/Webhooks/Events/Member/ExportedMemberWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Member/ExportedMemberWebhookEvent.cs
@@ -21,6 +21,6 @@ public class ExportedMemberWebhookEvent : WebhookEventBase<ExportedMemberNotific
 
     public override string Alias => Constants.WebhookEvents.Aliases.ExportedMember;
 
-    public override object? ConvertNotificationToRequestPayload(ExportedMemberNotification notification)
+    public override object ConvertNotificationToRequestPayload(ExportedMemberNotification notification)
         => new DefaultPayloadModel { Id = notification.Member.Key };
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Member/MemberDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Member/MemberDeletedWebhookEvent.cs
index d10af81418..4f097192d8 100644
--- a/src/Umbraco.Core/Webhooks/Events/Member/MemberDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Member/MemberDeletedWebhookEvent.cs
@@ -21,7 +21,7 @@ public class MemberDeletedWebhookEvent : WebhookEventBase<MemberDeletedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(MemberDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberDeletedNotification notification)
         => notification.DeletedEntities.Select(entity
             => new DefaultPayloadModel { Id = entity.Key, });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Member/MemberGroupDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Member/MemberGroupDeletedWebhookEvent.cs
index 2b14121714..aad3421e58 100644
--- a/src/Umbraco.Core/Webhooks/Events/Member/MemberGroupDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Member/MemberGroupDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class MemberGroupDeletedWebhookEvent : WebhookEventBase<MemberGroupDelete
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberGroupDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(MemberGroupDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberGroupDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Member/MemberGroupSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Member/MemberGroupSavedWebhookEvent.cs
index 417ec08c7a..24d6b93101 100644
--- a/src/Umbraco.Core/Webhooks/Events/Member/MemberGroupSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Member/MemberGroupSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class MemberGroupSavedWebhookEvent : WebhookEventBase<MemberGroupSavedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberGroupSaved;
 
-    public override object? ConvertNotificationToRequestPayload(MemberGroupSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberGroupSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel{ Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Member/MemberSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Member/MemberSavedWebhookEvent.cs
index 31c00aa97a..dacff8fcd6 100644
--- a/src/Umbraco.Core/Webhooks/Events/Member/MemberSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Member/MemberSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class MemberSavedWebhookEvent : WebhookEventBase<MemberSavedNotification>
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberSaved;
 
-    public override object? ConvertNotificationToRequestPayload(MemberSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Member/RemovedMemberRolesWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Member/RemovedMemberRolesWebhookEvent.cs
index d4f3ada81a..c8109b0d19 100644
--- a/src/Umbraco.Core/Webhooks/Events/Member/RemovedMemberRolesWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Member/RemovedMemberRolesWebhookEvent.cs
@@ -25,7 +25,7 @@ public class RemovedMemberRolesWebhookEvent : WebhookEventBase<RemovedMemberRole
 
     public override string Alias => Constants.WebhookEvents.Aliases.RemovedMemberRoles;
 
-    public override object? ConvertNotificationToRequestPayload(RemovedMemberRolesNotification notification)
+    public override object ConvertNotificationToRequestPayload(RemovedMemberRolesNotification notification)
         => new
         {
             Ids = notification.MemberIds.Select(id => _idKeyMap.GetKeyForId(id, UmbracoObjectTypes.Member).Result),
diff --git a/src/Umbraco.Core/Webhooks/Events/Package/ImportedPackageWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Package/ImportedPackageWebhookEvent.cs
index 6f40163038..4b003ff2a3 100644
--- a/src/Umbraco.Core/Webhooks/Events/Package/ImportedPackageWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Package/ImportedPackageWebhookEvent.cs
@@ -20,7 +20,7 @@ public class ImportedPackageWebhookEvent : WebhookEventBase<ImportedPackageNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.PackageImported;
 
-    public override object? ConvertNotificationToRequestPayload(ImportedPackageNotification notification)
+    public override object ConvertNotificationToRequestPayload(ImportedPackageNotification notification)
         => new
         {
             PackageName = notification.InstallationSummary.PackageName,
diff --git a/src/Umbraco.Core/Webhooks/Events/PublicAccess/PublicAccessEntryDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/PublicAccess/PublicAccessEntryDeletedWebhookEvent.cs
index 2be0227680..4a9593c123 100644
--- a/src/Umbraco.Core/Webhooks/Events/PublicAccess/PublicAccessEntryDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/PublicAccess/PublicAccessEntryDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class PublicAccessEntryDeletedWebhookEvent : WebhookEventBase<PublicAcces
 
     public override string Alias => Constants.WebhookEvents.Aliases.PublicAccessEntryDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(PublicAccessEntryDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(PublicAccessEntryDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/PublicAccess/PublicAccessEntrySavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/PublicAccess/PublicAccessEntrySavedWebhookEvent.cs
index 73592727a5..7ac8163371 100644
--- a/src/Umbraco.Core/Webhooks/Events/PublicAccess/PublicAccessEntrySavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/PublicAccess/PublicAccessEntrySavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class PublicAccessEntrySavedWebhookEvent : WebhookEventBase<PublicAccessE
 
     public override string Alias => Constants.WebhookEvents.Aliases.PublicAccessEntrySaved;
 
-    public override object? ConvertNotificationToRequestPayload(PublicAccessEntrySavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(PublicAccessEntrySavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Relation/RelationDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Relation/RelationDeletedWebhookEvent.cs
index a9c84a1c22..94e6f326aa 100644
--- a/src/Umbraco.Core/Webhooks/Events/Relation/RelationDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Relation/RelationDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class RelationDeletedWebhookEvent : WebhookEventBase<RelationDeletedNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.RelationDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(RelationDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(RelationDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/Relation/RelationSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/Relation/RelationSavedWebhookEvent.cs
index 8d810a3985..219abbc280 100644
--- a/src/Umbraco.Core/Webhooks/Events/Relation/RelationSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/Relation/RelationSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class RelationSavedWebhookEvent : WebhookEventBase<RelationSavedNotificat
 
     public override string Alias => Constants.WebhookEvents.Aliases.RelationSaved;
 
-    public override object? ConvertNotificationToRequestPayload(RelationSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(RelationSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/RelationType/RelationTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/RelationType/RelationTypeDeletedWebhookEvent.cs
index 14792db9af..e26ccc3dfa 100644
--- a/src/Umbraco.Core/Webhooks/Events/RelationType/RelationTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/RelationType/RelationTypeDeletedWebhookEvent.cs
@@ -22,6 +22,6 @@ public class RelationTypeDeletedWebhookEvent : WebhookEventBase<RelationTypeDele
 
     public override string Alias => Constants.WebhookEvents.Aliases.RelationTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(RelationTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(RelationTypeDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/RelationType/RelationTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/RelationType/RelationTypeSavedWebhookEvent.cs
index 5773d6c92c..04a509c19d 100644
--- a/src/Umbraco.Core/Webhooks/Events/RelationType/RelationTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/RelationType/RelationTypeSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class RelationTypeSavedWebhookEvent : WebhookEventBase<RelationTypeSavedN
 
     public override string Alias => Constants.WebhookEvents.Aliases.RelationTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(RelationTypeSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(RelationTypeSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/User/AssignedUserGroupPermissionsWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/AssignedUserGroupPermissionsWebhookEvent.cs
index e0e3fdd28a..18716d5afd 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/AssignedUserGroupPermissionsWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/AssignedUserGroupPermissionsWebhookEvent.cs
@@ -25,7 +25,7 @@ public class AssignedUserGroupPermissionsWebhookEvent : WebhookEventBase<Assigne
 
     public override string Alias => Constants.WebhookEvents.Aliases.AssignedUserGroupPermissions;
 
-    public override object? ConvertNotificationToRequestPayload(AssignedUserGroupPermissionsNotification notification)
+    public override object ConvertNotificationToRequestPayload(AssignedUserGroupPermissionsNotification notification)
         => notification.EntityPermissions.Select(permission =>
         new {
             UserId = _idKeyMap.GetKeyForId(permission.EntityId, UmbracoObjectTypes.Unknown).Result,
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserDeletedWebhookEvent.cs
index bd1dd7139a..f848570d8e 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class UserDeletedWebhookEvent : WebhookEventBase<UserDeletedNotification>
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(UserDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserForgotPasswordRequestedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserForgotPasswordRequestedWebhookEvent.cs
index 2d3dc596ed..e791206e6a 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserForgotPasswordRequestedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserForgotPasswordRequestedWebhookEvent.cs
@@ -21,7 +21,7 @@ public class UserForgotPasswordRequestedWebhookEvent : WebhookEventBase<UserForg
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserForgotPasswordRequested;
 
-    public override object? ConvertNotificationToRequestPayload(UserForgotPasswordRequestedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserForgotPasswordRequestedNotification notification)
         => new DefaultPayloadModel
         {
             Id = notification.AffectedUserId is not null &&
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserGroupDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserGroupDeletedWebhookEvent.cs
index 258157c4cd..3b00be82e0 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserGroupDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserGroupDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class UserGroupDeletedWebhookEvent : WebhookEventBase<UserGroupDeletedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserGroupDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(UserGroupDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserGroupDeletedNotification notification)
         => notification.DeletedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserGroupSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserGroupSavedWebhookEvent.cs
index 4dd224e6b8..8cda0d25c4 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserGroupSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserGroupSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class UserGroupSavedWebhookEvent : WebhookEventBase<UserGroupSavedNotific
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserGroupSaved;
 
-    public override object? ConvertNotificationToRequestPayload(UserGroupSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserGroupSavedNotification notification)
         => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserLockedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserLockedWebhookEvent.cs
index 9cb8346d5f..184e85704a 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserLockedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserLockedWebhookEvent.cs
@@ -21,7 +21,7 @@ public class UserLockedWebhookEvent : WebhookEventBase<UserLockedNotification>
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserLocked;
 
-    public override object? ConvertNotificationToRequestPayload(UserLockedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserLockedNotification notification)
         => new DefaultPayloadModel
         {
             Id = notification.AffectedUserId is not null &&
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserLoginFailedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserLoginFailedWebhookEvent.cs
index 3587e422c1..b79a841813 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserLoginFailedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserLoginFailedWebhookEvent.cs
@@ -21,7 +21,7 @@ public class UserLoginFailedWebhookEvent : WebhookEventBase<UserLoginFailedNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserLoginFailed;
 
-    public override object? ConvertNotificationToRequestPayload(UserLoginFailedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserLoginFailedNotification notification)
         => new DefaultPayloadModel
         {
             Id = notification.AffectedUserId is not null &&
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserLoginRequiresVerificationWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserLoginRequiresVerificationWebhookEvent.cs
index 9270df69e1..c35a0729ec 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserLoginRequiresVerificationWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserLoginRequiresVerificationWebhookEvent.cs
@@ -21,7 +21,7 @@ public class UserLoginRequiresVerificationWebhookEvent : WebhookEventBase<UserLo
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserLoginRequiresVerification;
 
-    public override object? ConvertNotificationToRequestPayload(UserLoginRequiresVerificationNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserLoginRequiresVerificationNotification notification)
         => new DefaultPayloadModel
         {
             Id = notification.AffectedUserId is not null &&
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserLoginSuccessWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserLoginSuccessWebhookEvent.cs
index c2966e865d..d98bd63a26 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserLoginSuccessWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserLoginSuccessWebhookEvent.cs
@@ -21,7 +21,7 @@ public class UserLoginSuccessWebhookEvent : WebhookEventBase<UserLoginSuccessNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserLoginSuccess;
 
-    public override object? ConvertNotificationToRequestPayload(UserLoginSuccessNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserLoginSuccessNotification notification)
         => new DefaultPayloadModel
         {
             Id = notification.AffectedUserId is not null &&
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserLogoutSuccessWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserLogoutSuccessWebhookEvent.cs
index 2d43807668..f89c528038 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserLogoutSuccessWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserLogoutSuccessWebhookEvent.cs
@@ -21,7 +21,7 @@ public class UserLogoutSuccessWebhookEvent : WebhookEventBase<UserLogoutSuccessN
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserLogoutSuccess;
 
-    public override object? ConvertNotificationToRequestPayload(UserLogoutSuccessNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserLogoutSuccessNotification notification)
         => new DefaultPayloadModel
         {
             Id = notification.AffectedUserId is not null &&
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserPasswordChangedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserPasswordChangedWebhookEvent.cs
index 5cda02ccad..b02d80da0e 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserPasswordChangedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserPasswordChangedWebhookEvent.cs
@@ -21,7 +21,7 @@ public class UserPasswordChangedWebhookEvent : WebhookEventBase<UserPasswordChan
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserPasswordChanged;
 
-    public override object? ConvertNotificationToRequestPayload(UserPasswordChangedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserPasswordChangedNotification notification)
         => new
         {
             Id = notification.AffectedUserId is not null &&
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserPasswordResetWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserPasswordResetWebhookEvent.cs
index 849494c6d2..811ca8dbd1 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserPasswordResetWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserPasswordResetWebhookEvent.cs
@@ -20,7 +20,7 @@ public class UserPasswordResetWebhookEvent : WebhookEventBase<UserPasswordResetN
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserPasswordReset;
 
-    public override object? ConvertNotificationToRequestPayload(UserPasswordResetNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserPasswordResetNotification notification)
         => new
         {
             Id = notification.AffectedUserId is not null &&
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserSavedWebhookEvent.cs
index 1ecd1cdcb4..115b3406db 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserSavedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class UserSavedWebhookEvent : WebhookEventBase<UserSavedNotification>
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserSaved;
 
-    public override object? ConvertNotificationToRequestPayload(UserSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserSavedNotification notification)
     => notification.SavedEntities.Select(entity => new DefaultPayloadModel { Id = entity.Key });
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserTwoFactorRequestedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserTwoFactorRequestedWebhookEvent.cs
index 5ca01bfdc8..2183498e69 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserTwoFactorRequestedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserTwoFactorRequestedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class UserTwoFactorRequestedWebhookEvent : WebhookEventBase<UserTwoFactor
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserTwoFactorRequested;
 
-    public override object? ConvertNotificationToRequestPayload(UserTwoFactorRequestedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserTwoFactorRequestedNotification notification)
         => new DefaultPayloadModel { Id = notification.UserKey };
 }
diff --git a/src/Umbraco.Core/Webhooks/Events/User/UserUnlockedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/User/UserUnlockedWebhookEvent.cs
index 208c0752d5..f2835ed2ee 100644
--- a/src/Umbraco.Core/Webhooks/Events/User/UserUnlockedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/Events/User/UserUnlockedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class UserUnlockedWebhookEvent : WebhookEventBase<UserUnlockedNotificatio
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserUnlocked;
 
-    public override object? ConvertNotificationToRequestPayload(UserUnlockedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserUnlockedNotification notification)
         => new
         {
             Id = notification.AffectedUserId is not null &&
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentCopiedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentCopiedWebhookEvent.cs
index 0717afbf37..6598782606 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentCopiedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentCopiedWebhookEvent.cs
@@ -24,7 +24,7 @@ public class LegacyContentCopiedWebhookEvent : WebhookEventBase<ContentCopiedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentCopied;
 
-    public override object? ConvertNotificationToRequestPayload(ContentCopiedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentCopiedNotification notification)
     {
         return new
         {
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentDeletedVersionsWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentDeletedVersionsWebhookEvent.cs
index c389c58b5e..dee9d7c79f 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentDeletedVersionsWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentDeletedVersionsWebhookEvent.cs
@@ -24,7 +24,7 @@ public class LegacyContentDeletedVersionsWebhookEvent : WebhookEventBase<Content
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentDeletedVersions;
 
-    public override object? ConvertNotificationToRequestPayload(ContentDeletedVersionsNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentDeletedVersionsNotification notification)
     {
         return new
         {
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentMovedToRecycleBinWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentMovedToRecycleBinWebhookEvent.cs
index 5c5af89a06..0940a899c6 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentMovedToRecycleBinWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentMovedToRecycleBinWebhookEvent.cs
@@ -24,6 +24,6 @@ public class LegacyContentMovedToRecycleBinWebhookEvent : WebhookEventBase<Conte
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentMovedToRecycleBin;
 
-    public override object? ConvertNotificationToRequestPayload(ContentMovedToRecycleBinNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentMovedToRecycleBinNotification notification)
         => notification.MoveInfoCollection;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentMovedWebhookEvent.cs
index e14216a52e..247790529d 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentMovedWebhookEvent.cs
@@ -24,6 +24,6 @@ public class LegacyContentMovedWebhookEvent : WebhookEventBase<ContentMovedNotif
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentMoved;
 
-    public override object? ConvertNotificationToRequestPayload(ContentMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentMovedNotification notification)
         => notification.MoveInfoCollection;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentSortedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentSortedWebhookEvent.cs
index 56ff021691..79d4c1fd0c 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentSortedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Content/LegacyContentSortedWebhookEvent.cs
@@ -35,7 +35,7 @@ public class LegacyContentSortedWebhookEvent : WebhookEventBase<ContentSortedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.ContentSorted;
 
-    public override object? ConvertNotificationToRequestPayload(ContentSortedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentSortedNotification notification)
     {
         var sortedEntities = new List<object?>();
         foreach (var entity in notification.SortedEntities)
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeChangedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeChangedWebhookEvent.cs
index 9649c5a565..fe563b6e73 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeChangedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeChangedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDocumentTypeChangedWebhookEvent : WebhookEventBase<ContentTyp
 
     public override string Alias => Constants.WebhookEvents.Aliases.DocumentTypeChanged;
 
-    public override object? ConvertNotificationToRequestPayload(ContentTypeChangedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentTypeChangedNotification notification)
         => notification.Changes;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeDeletedWebhookEvent.cs
index e01cfcd856..3be9de263f 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDocumentTypeDeletedWebhookEvent : WebhookEventBase<ContentTyp
 
     public override string Alias => Constants.WebhookEvents.Aliases.DocumentTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(ContentTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentTypeDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeMovedWebhookEvent.cs
index 07966b92c5..237f4f4c76 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeMovedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDocumentTypeMovedWebhookEvent : WebhookEventBase<ContentTypeM
 
     public override string Alias => Constants.WebhookEvents.Aliases.DocumentTypeMoved;
 
-    public override object? ConvertNotificationToRequestPayload(ContentTypeMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentTypeMovedNotification notification)
         => notification.MoveInfoCollection;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeSavedWebhookEvent.cs
index 22658f8c66..c1a4b8c54c 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyDocumentTypeSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDocumentTypeSavedWebhookEvent : WebhookEventBase<ContentTypeS
 
     public override string Alias => Constants.WebhookEvents.Aliases.DocumentTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(ContentTypeSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ContentTypeSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeChangedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeChangedWebhookEvent.cs
index e454aa9863..410cc691dd 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeChangedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeChangedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMediaTypeChangedWebhookEvent : WebhookEventBase<MediaTypeChan
 
     public override string Alias => Constants.WebhookEvents.Aliases.MediaTypeChanged;
 
-    public override object? ConvertNotificationToRequestPayload(MediaTypeChangedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MediaTypeChangedNotification notification)
         => notification.Changes;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeDeletedWebhookEvent.cs
index fae04d23d6..56f59185a2 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMediaTypeDeletedWebhookEvent : WebhookEventBase<MediaTypeDele
 
     public override string Alias => Constants.WebhookEvents.Aliases.MediaTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(MediaTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MediaTypeDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeMovedWebhookEvent.cs
index c6644e82f8..4f7153517c 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeMovedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMediaTypeMovedWebhookEvent : WebhookEventBase<MediaTypeMovedN
 
     public override string Alias => Constants.WebhookEvents.Aliases.MediaTypeMoved;
 
-    public override object? ConvertNotificationToRequestPayload(MediaTypeMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MediaTypeMovedNotification notification)
         => notification.MoveInfoCollection;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeSavedWebhookEvent.cs
index 38c6025f63..d2e97e3aa0 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMediaTypeSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMediaTypeSavedWebhookEvent : WebhookEventBase<MediaTypeSavedN
 
     public override string Alias => Constants.WebhookEvents.Aliases.MediaTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(MediaTypeSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MediaTypeSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeChangedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeChangedWebhookEvent.cs
index 0fb8b8074a..d551bed795 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeChangedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeChangedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMemberTypeChangedWebhookEvent : WebhookEventBase<MemberTypeCh
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberTypeChanged;
 
-    public override object? ConvertNotificationToRequestPayload(MemberTypeChangedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberTypeChangedNotification notification)
         => notification.Changes;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeDeletedWebhookEvent.cs
index cc70a2dd75..cca712e1ce 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMemberTypeDeletedWebhookEvent : WebhookEventBase<MemberTypeDe
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(MemberTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberTypeDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeMovedWebhookEvent.cs
index b85c27c119..ae5bd2cf66 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeMovedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMemberTypeMovedWebhookEvent : WebhookEventBase<MemberTypeMove
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberTypeMoved;
 
-    public override object? ConvertNotificationToRequestPayload(MemberTypeMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberTypeMovedNotification notification)
         => notification.MoveInfoCollection;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeSavedWebhookEvent.cs
index add550d43a..5eb60eafa8 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/ContentType/LegacyMemberTypeSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMemberTypeSavedWebhookEvent : WebhookEventBase<MemberTypeSave
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(MemberTypeSavedNotification notification) =>
+    public override object ConvertNotificationToRequestPayload(MemberTypeSavedNotification notification) =>
         notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeDeletedWebhookEvent.cs
index 41665749bf..0bb7b04031 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDataTypeDeletedWebhookEvent : WebhookEventBase<DataTypeDelete
 
     public override string Alias => Constants.WebhookEvents.Aliases.DataTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(DataTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DataTypeDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeMovedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeMovedWebhookEvent.cs
index 650319afb6..164065e6db 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeMovedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeMovedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDataTypeMovedWebhookEvent : WebhookEventBase<DataTypeMovedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.DataTypeMoved;
 
-    public override object? ConvertNotificationToRequestPayload(DataTypeMovedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DataTypeMovedNotification notification)
         => notification.MoveInfoCollection;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeSavedWebhookEvent.cs
index 81bca24516..8a4ae1cdb7 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/DataType/LegacyDataTypeSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDataTypeSavedWebhookEvent : WebhookEventBase<DataTypeSavedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.DataTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(DataTypeSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DataTypeSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Dictionary/LegacyDictionaryItemDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Dictionary/LegacyDictionaryItemDeletedWebhookEvent.cs
index e8285c8aa0..926421da04 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Dictionary/LegacyDictionaryItemDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Dictionary/LegacyDictionaryItemDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDictionaryItemDeletedWebhookEvent : WebhookEventBase<Dictiona
 
     public override string Alias => Constants.WebhookEvents.Aliases.DictionaryItemDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(DictionaryItemDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DictionaryItemDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Dictionary/LegacyDictionaryItemSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Dictionary/LegacyDictionaryItemSavedWebhookEvent.cs
index 1dafad53b9..8c39b58e1a 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Dictionary/LegacyDictionaryItemSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Dictionary/LegacyDictionaryItemSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDictionaryItemSavedWebhookEvent : WebhookEventBase<Dictionary
 
     public override string Alias => Constants.WebhookEvents.Aliases.DictionaryItemSaved;
 
-    public override object? ConvertNotificationToRequestPayload(DictionaryItemSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DictionaryItemSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Domain/LegacyDomainDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Domain/LegacyDomainDeletedWebhookEvent.cs
index 994cd0e021..6187e3ecdf 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Domain/LegacyDomainDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Domain/LegacyDomainDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDomainDeletedWebhookEvent : WebhookEventBase<DomainDeletedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.DomainDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(DomainDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DomainDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Domain/LegacyDomainSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Domain/LegacyDomainSavedWebhookEvent.cs
index 5d529ff1ad..5a39d882b8 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Domain/LegacyDomainSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Domain/LegacyDomainSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyDomainSavedWebhookEvent : WebhookEventBase<DomainSavedNotific
 
     public override string Alias => Constants.WebhookEvents.Aliases.DomainSaved;
 
-    public override object? ConvertNotificationToRequestPayload(DomainSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(DomainSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyPartialViewDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyPartialViewDeletedWebhookEvent.cs
index bbcc1dd7f1..02e7a1e142 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyPartialViewDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyPartialViewDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyPartialViewDeletedWebhookEvent : WebhookEventBase<PartialView
 
     public override string Alias => Constants.WebhookEvents.Aliases.PartialViewDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(PartialViewDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(PartialViewDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyPartialViewSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyPartialViewSavedWebhookEvent.cs
index c9b9642e6f..751d4ab391 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyPartialViewSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyPartialViewSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyPartialViewSavedWebhookEvent : WebhookEventBase<PartialViewSa
 
     public override string Alias => Constants.WebhookEvents.Aliases.PartialViewSaved;
 
-    public override object? ConvertNotificationToRequestPayload(PartialViewSavedNotification notification) =>
+    public override object ConvertNotificationToRequestPayload(PartialViewSavedNotification notification) =>
         notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyScriptDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyScriptDeletedWebhookEvent.cs
index efe74a2ce1..16503c81ea 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyScriptDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyScriptDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyScriptDeletedWebhookEvent : WebhookEventBase<ScriptDeletedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.ScriptDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(ScriptDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ScriptDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyScriptSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyScriptSavedWebhookEvent.cs
index e473f1902e..c16a2f48f6 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyScriptSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyScriptSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyScriptSavedWebhookEvent : WebhookEventBase<ScriptSavedNotific
 
     public override string Alias => Constants.WebhookEvents.Aliases.ScriptSaved;
 
-    public override object? ConvertNotificationToRequestPayload(ScriptSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(ScriptSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyStylesheetDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyStylesheetDeletedWebhookEvent.cs
index 140eaa9e1b..2f5c3c3990 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyStylesheetDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyStylesheetDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyStylesheetDeletedWebhookEvent : WebhookEventBase<StylesheetDe
 
     public override string Alias => Constants.WebhookEvents.Aliases.StylesheetDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(StylesheetDeletedNotification notification) =>
+    public override object ConvertNotificationToRequestPayload(StylesheetDeletedNotification notification) =>
         notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyStylesheetSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyStylesheetSavedWebhookEvent.cs
index 7e4d5cf282..9ddc79780c 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyStylesheetSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyStylesheetSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyStylesheetSavedWebhookEvent : WebhookEventBase<StylesheetSave
 
     public override string Alias => Constants.WebhookEvents.Aliases.StylesheetSaved;
 
-    public override object? ConvertNotificationToRequestPayload(StylesheetSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(StylesheetSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyTemplateDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyTemplateDeletedWebhookEvent.cs
index 3a0f838179..95a71dd1ff 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyTemplateDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyTemplateDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyTemplateDeletedWebhookEvent : WebhookEventBase<TemplateDelete
 
     public override string Alias => Constants.WebhookEvents.Aliases.TemplateDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(TemplateDeletedNotification notification) =>
+    public override object ConvertNotificationToRequestPayload(TemplateDeletedNotification notification) =>
         notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyTemplateSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyTemplateSavedWebhookEvent.cs
index b378183e60..133d4685c9 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyTemplateSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/File/LegacyTemplateSavedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class LegacyTemplateSavedWebhookEvent : WebhookEventBase<TemplateSavedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.TemplateSaved;
 
-    public override object? ConvertNotificationToRequestPayload(TemplateSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(TemplateSavedNotification notification)
     {
         // Create a new anonymous object with the properties we want
         return new
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/HealthCheck/LegacyHealthCheckCompletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/HealthCheck/LegacyHealthCheckCompletedWebhookEvent.cs
index 3b909ba991..9291259bc7 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/HealthCheck/LegacyHealthCheckCompletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/HealthCheck/LegacyHealthCheckCompletedWebhookEvent.cs
@@ -15,7 +15,7 @@ public class LegacyHealthCheckCompletedWebhookEvent : WebhookEventBase<HealthChe
 
     public override string Alias => Constants.WebhookEvents.Aliases.HealthCheckCompleted;
 
-    public override object? ConvertNotificationToRequestPayload(HealthCheckCompletedNotification notification) =>
+    public override object ConvertNotificationToRequestPayload(HealthCheckCompletedNotification notification) =>
         new
         {
             notification.HealthCheckResults.AllChecksSuccessful,
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Language/LegacyLanguageDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Language/LegacyLanguageDeletedWebhookEvent.cs
index 178582823d..43750f1cae 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Language/LegacyLanguageDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Language/LegacyLanguageDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyLanguageDeletedWebhookEvent : WebhookEventBase<LanguageDelete
 
     public override string Alias => Constants.WebhookEvents.Aliases.LanguageDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(LanguageDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(LanguageDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Language/LegacyLanguageSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Language/LegacyLanguageSavedWebhookEvent.cs
index c2d6774f93..4173efab62 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Language/LegacyLanguageSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Language/LegacyLanguageSavedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class LegacyLanguageSavedWebhookEvent : WebhookEventBase<LanguageSavedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.LanguageSaved;
 
-    public override object? ConvertNotificationToRequestPayload(LanguageSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(LanguageSavedNotification notification)
         => notification.SavedEntities;
 }
 
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyExportedMemberWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyExportedMemberWebhookEvent.cs
index 7532dc133f..189a5f535b 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyExportedMemberWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyExportedMemberWebhookEvent.cs
@@ -20,7 +20,7 @@ public class LegacyExportedMemberWebhookEvent : WebhookEventBase<ExportedMemberN
 
     public override string Alias => Constants.WebhookEvents.Aliases.ExportedMember;
 
-    public override object? ConvertNotificationToRequestPayload(ExportedMemberNotification notification)
+    public override object ConvertNotificationToRequestPayload(ExportedMemberNotification notification)
     {
         // No need to return the original member in the notification as well
         return new
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberDeletedWebhookEvent.cs
index 1f4a6c9d34..44a671b05c 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberDeletedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class LegacyMemberDeletedWebhookEvent : WebhookEventBase<MemberDeletedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(MemberDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberDeletedNotification notification)
     {
         var result = notification.DeletedEntities.Select(entity => new
         {
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberGroupDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberGroupDeletedWebhookEvent.cs
index e02e3c2f60..19096e58d0 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberGroupDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberGroupDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMemberGroupDeletedWebhookEvent : WebhookEventBase<MemberGroup
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberGroupDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(MemberGroupDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberGroupDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberGroupSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberGroupSavedWebhookEvent.cs
index 7b43732a75..11781be4c5 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberGroupSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberGroupSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyMemberGroupSavedWebhookEvent : WebhookEventBase<MemberGroupSa
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberGroupSaved;
 
-    public override object? ConvertNotificationToRequestPayload(MemberGroupSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberGroupSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberSavedWebhookEvent.cs
index c81983cbf2..0fd7599bf7 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Member/LegacyMemberSavedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class LegacyMemberSavedWebhookEvent : WebhookEventBase<MemberSavedNotific
 
     public override string Alias => Constants.WebhookEvents.Aliases.MemberSaved;
 
-    public override object? ConvertNotificationToRequestPayload(MemberSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(MemberSavedNotification notification)
     {
         var result = notification.SavedEntities.Select(entity => new
         {
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/PublicAccess/LegacyPublicAccessEntryDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/PublicAccess/LegacyPublicAccessEntryDeletedWebhookEvent.cs
index e8be6aac92..f857ed41e8 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/PublicAccess/LegacyPublicAccessEntryDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/PublicAccess/LegacyPublicAccessEntryDeletedWebhookEvent.cs
@@ -20,5 +20,5 @@ public class LegacyPublicAccessEntryDeletedWebhookEvent : WebhookEventBase<Publi
 
     public override string Alias => Constants.WebhookEvents.Aliases.PublicAccessEntryDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(PublicAccessEntryDeletedNotification notification) => notification.DeletedEntities;
+    public override object ConvertNotificationToRequestPayload(PublicAccessEntryDeletedNotification notification) => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/PublicAccess/LegacyPublicAccessEntrySavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/PublicAccess/LegacyPublicAccessEntrySavedWebhookEvent.cs
index c1785720d1..95c0240b2d 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/PublicAccess/LegacyPublicAccessEntrySavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/PublicAccess/LegacyPublicAccessEntrySavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyPublicAccessEntrySavedWebhookEvent : WebhookEventBase<PublicA
 
     public override string Alias => Constants.WebhookEvents.Aliases.PublicAccessEntrySaved;
 
-    public override object? ConvertNotificationToRequestPayload(PublicAccessEntrySavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(PublicAccessEntrySavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Relation/LegacyRelationDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Relation/LegacyRelationDeletedWebhookEvent.cs
index 5bd105e4c3..a07e1a9f8e 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Relation/LegacyRelationDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Relation/LegacyRelationDeletedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyRelationDeletedWebhookEvent : WebhookEventBase<RelationDelete
 
     public override string Alias => Constants.WebhookEvents.Aliases.RelationDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(RelationDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(RelationDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/Relation/LegacyRelationSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/Relation/LegacyRelationSavedWebhookEvent.cs
index 435f9b0560..90d3b89caf 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/Relation/LegacyRelationSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/Relation/LegacyRelationSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyRelationSavedWebhookEvent : WebhookEventBase<RelationSavedNot
 
     public override string Alias => Constants.WebhookEvents.Aliases.RelationSaved;
 
-    public override object? ConvertNotificationToRequestPayload(RelationSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(RelationSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/RelationType/LegacyRelationTypeDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/RelationType/LegacyRelationTypeDeletedWebhookEvent.cs
index 391a936413..0ddc21ebdb 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/RelationType/LegacyRelationTypeDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/RelationType/LegacyRelationTypeDeletedWebhookEvent.cs
@@ -21,6 +21,6 @@ public class LegacyRelationTypeDeletedWebhookEvent : WebhookEventBase<RelationTy
 
     public override string Alias => Constants.WebhookEvents.Aliases.RelationTypeDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(RelationTypeDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(RelationTypeDeletedNotification notification)
         => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/RelationType/LegacyRelationTypeSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/RelationType/LegacyRelationTypeSavedWebhookEvent.cs
index b306b7f053..6876dc6653 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/RelationType/LegacyRelationTypeSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/RelationType/LegacyRelationTypeSavedWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyRelationTypeSavedWebhookEvent : WebhookEventBase<RelationType
 
     public override string Alias => Constants.WebhookEvents.Aliases.RelationTypeSaved;
 
-    public override object? ConvertNotificationToRequestPayload(RelationTypeSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(RelationTypeSavedNotification notification)
         => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyAssignedUserGroupPermissionsWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyAssignedUserGroupPermissionsWebhookEvent.cs
index 579e791729..da2bbac692 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyAssignedUserGroupPermissionsWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyAssignedUserGroupPermissionsWebhookEvent.cs
@@ -20,6 +20,6 @@ public class LegacyAssignedUserGroupPermissionsWebhookEvent : WebhookEventBase<A
 
     public override string Alias => Constants.WebhookEvents.Aliases.AssignedUserGroupPermissions;
 
-    public override object? ConvertNotificationToRequestPayload(AssignedUserGroupPermissionsNotification notification)
+    public override object ConvertNotificationToRequestPayload(AssignedUserGroupPermissionsNotification notification)
         => notification.EntityPermissions;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserDeletedWebhookEvent.cs
index b969db7917..0d6e268454 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserDeletedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class LegacyUserDeletedWebhookEvent : WebhookEventBase<UserDeletedNotific
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(UserDeletedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserDeletedNotification notification)
     {
         var result = notification.DeletedEntities.Select(entity => new
         {
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserGroupDeletedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserGroupDeletedWebhookEvent.cs
index e795da0d79..336921bda2 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserGroupDeletedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserGroupDeletedWebhookEvent.cs
@@ -20,5 +20,5 @@ public class LegacyUserGroupDeletedWebhookEvent : WebhookEventBase<UserGroupDele
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserGroupDeleted;
 
-    public override object? ConvertNotificationToRequestPayload(UserGroupDeletedNotification notification) => notification.DeletedEntities;
+    public override object ConvertNotificationToRequestPayload(UserGroupDeletedNotification notification) => notification.DeletedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserGroupSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserGroupSavedWebhookEvent.cs
index 64dec7c2ce..2131596be4 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserGroupSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserGroupSavedWebhookEvent.cs
@@ -20,5 +20,5 @@ public class LegacyUserGroupSavedWebhookEvent : WebhookEventBase<UserGroupSavedN
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserGroupSaved;
 
-    public override object? ConvertNotificationToRequestPayload(UserGroupSavedNotification notification) => notification.SavedEntities;
+    public override object ConvertNotificationToRequestPayload(UserGroupSavedNotification notification) => notification.SavedEntities;
 }
diff --git a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserSavedWebhookEvent.cs b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserSavedWebhookEvent.cs
index 70f57c1dbd..383119dd62 100644
--- a/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserSavedWebhookEvent.cs
+++ b/src/Umbraco.Core/Webhooks/LegacyEvents/User/LegacyUserSavedWebhookEvent.cs
@@ -20,7 +20,7 @@ public class LegacyUserSavedWebhookEvent : WebhookEventBase<UserSavedNotificatio
 
     public override string Alias => Constants.WebhookEvents.Aliases.UserSaved;
 
-    public override object? ConvertNotificationToRequestPayload(UserSavedNotification notification)
+    public override object ConvertNotificationToRequestPayload(UserSavedNotification notification)
     {
         var result = notification.SavedEntities.Select(entity => new
         {
diff --git a/src/Umbraco.Core/Webhooks/WebhookEventBase.cs b/src/Umbraco.Core/Webhooks/WebhookEventBase.cs
index 138ebc56fd..b0d5e7d2e2 100644
--- a/src/Umbraco.Core/Webhooks/WebhookEventBase.cs
+++ b/src/Umbraco.Core/Webhooks/WebhookEventBase.cs
@@ -103,6 +103,6 @@ public abstract class WebhookEventBase<TNotification> : IWebhookEvent, INotifica
     /// </summary>
     /// <param name="notification"></param>
     /// <returns></returns>
-    public virtual object? ConvertNotificationToRequestPayload(TNotification notification)
+    public virtual object ConvertNotificationToRequestPayload(TNotification notification)
         => notification;
 }
diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogExpressionsFunctions.cs b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogExpressionsFunctions.cs
index 9cf9cc7307..28d5f155fc 100644
--- a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogExpressionsFunctions.cs
+++ b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogExpressionsFunctions.cs
@@ -6,5 +6,5 @@ public class SerilogExpressionsFunctions
 {
     // This Has() code is the same as the renamed IsDefined() function
     // Added this to help backport and ensure saved queries continue to work if using Has()
-    public static LogEventPropertyValue? Has(LogEventPropertyValue? value) => new ScalarValue(value != null);
+    public static LogEventPropertyValue Has(LogEventPropertyValue? value) => new ScalarValue(value != null);
 }
diff --git a/src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs b/src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs
index 2436eaca1f..a36c620ba7 100644
--- a/src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs
+++ b/src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs
@@ -28,7 +28,7 @@ public static class PublishedModelUtility
     // var contentType = PublishedContentType.Get(itemType, alias);
     //    // etc...
     // }
-    public static IPublishedContentType? GetModelContentType(
+    public static IPublishedContentType GetModelContentType(
         IPublishedContentTypeCache contentTypeCache,
         PublishedItemType itemType,
         string alias)
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index bc5b2c7954..d90bd3d8c3 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -1073,7 +1073,7 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
 
         public abstract int RecycleBinId { get; }
 
-        public virtual IEnumerable<TEntity>? GetRecycleBin()
+        public virtual IEnumerable<TEntity> GetRecycleBin()
         {
             return Get(Query<TEntity>().Where(entity => entity.Trashed));
         }
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
index 05c6a8a4f1..d91f902228 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
@@ -59,7 +59,7 @@ public class MarkdownEditorValueConverter : PropertyValueConverterBase, IDeliver
 
     public Type GetDeliveryApiPropertyValueType(IPublishedPropertyType propertyType) => typeof(string);
 
-    public object ConvertIntermediateToDeliveryApiObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object? inter, bool preview, bool expanding)
+    public object? ConvertIntermediateToDeliveryApiObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object? inter, bool preview, bool expanding)
     {
         if (inter is not string markdownString || markdownString.IsNullOrWhiteSpace())
         {
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
index 4b285caf1c..ee9613d454 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
@@ -60,7 +60,7 @@ public class MultiUrlPickerValueConverter : PropertyValueConverterBase, IDeliver
     public override bool? IsValue(object? value, PropertyValueLevel level) =>
         value is not null && value.ToString() != "[]";
 
-    public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview) => source?.ToString()!;
+    public override object? ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object? source, bool preview) => source?.ToString();
 
     public override object? ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object? inter, bool preview)
     {
diff --git a/src/Umbraco.Infrastructure/Serialization/JsonDictionaryStringIgnoreCaseConverter.cs b/src/Umbraco.Infrastructure/Serialization/JsonDictionaryStringIgnoreCaseConverter.cs
index 8d34cdb3cf..47048de3d6 100644
--- a/src/Umbraco.Infrastructure/Serialization/JsonDictionaryStringIgnoreCaseConverter.cs
+++ b/src/Umbraco.Infrastructure/Serialization/JsonDictionaryStringIgnoreCaseConverter.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Cms.Infrastructure.Serialization;
 public sealed class JsonDictionaryStringIgnoreCaseConverter<TValue> : ReadOnlyJsonConverter<Dictionary<string, TValue>>
 {
     /// <inheritdoc />
-    public override Dictionary<string, TValue>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    public override Dictionary<string, TValue> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         if (reader.TokenType != JsonTokenType.StartObject)
         {
diff --git a/src/Umbraco.Infrastructure/Serialization/JsonDictionaryStringInternIgnoreCaseConverter.cs b/src/Umbraco.Infrastructure/Serialization/JsonDictionaryStringInternIgnoreCaseConverter.cs
index 1e42cf7a21..b68c928085 100644
--- a/src/Umbraco.Infrastructure/Serialization/JsonDictionaryStringInternIgnoreCaseConverter.cs
+++ b/src/Umbraco.Infrastructure/Serialization/JsonDictionaryStringInternIgnoreCaseConverter.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Cms.Infrastructure.Serialization;
 public sealed class JsonDictionaryStringInternIgnoreCaseConverter<TValue> : ReadOnlyJsonConverter<Dictionary<string, TValue>>
 {
     /// <inheritdoc />
-    public override Dictionary<string, TValue>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    public override Dictionary<string, TValue> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         if (reader.TokenType != JsonTokenType.StartObject)
         {
diff --git a/src/Umbraco.Web.Common/Extensions/FriendlyPublishedContentExtensions.cs b/src/Umbraco.Web.Common/Extensions/FriendlyPublishedContentExtensions.cs
index 46a5c79a43..aea29f157e 100644
--- a/src/Umbraco.Web.Common/Extensions/FriendlyPublishedContentExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/FriendlyPublishedContentExtensions.cs
@@ -110,7 +110,7 @@ public static class FriendlyPublishedContentExtensions
     ///     The specific culture to get the name for. If null is used the current culture is used (Default is
     ///     null).
     /// </param>
-    public static string? Name(
+    public static string Name(
         this IPublishedContent content,
         string? culture = null)
         => content.Name(VariationContextAccessor, culture);
@@ -505,7 +505,7 @@ public static class FriendlyPublishedContentExtensions
     /// <remarks>
     ///     <para>Children are sorted by their sortOrder.</para>
     /// </remarks>
-    public static IEnumerable<IPublishedContent>? Children(
+    public static IEnumerable<IPublishedContent> Children(
         this IPublishedContent content,
         Func<IPublishedContent, bool> predicate,
         string? culture = null)
@@ -521,7 +521,7 @@ public static class FriendlyPublishedContentExtensions
     /// </param>
     /// <param name="contentTypeAlias">The content type alias.</param>
     /// <returns>The children of the content, of any of the specified types.</returns>
-    public static IEnumerable<IPublishedContent>? ChildrenOfType(this IPublishedContent content, string contentTypeAlias, string? culture = null)
+    public static IEnumerable<IPublishedContent> ChildrenOfType(this IPublishedContent content, string contentTypeAlias, string? culture = null)
         => content.ChildrenOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture);
 
     /// <summary>
@@ -537,7 +537,7 @@ public static class FriendlyPublishedContentExtensions
     /// <remarks>
     ///     <para>Children are sorted by their sortOrder.</para>
     /// </remarks>
-    public static IEnumerable<T>? Children<T>(this IPublishedContent content, string? culture = null)
+    public static IEnumerable<T> Children<T>(this IPublishedContent content, string? culture = null)
         where T : class, IPublishedContent
         => content.Children<T>(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture);
 
@@ -576,7 +576,7 @@ public static class FriendlyPublishedContentExtensions
     /// <remarks>
     ///     <para>Note that in V7 this method also return the content node self.</para>
     /// </remarks>
-    public static IEnumerable<IPublishedContent>? Siblings(this IPublishedContent content, string? culture = null)
+    public static IEnumerable<IPublishedContent> Siblings(this IPublishedContent content, string? culture = null)
         => content.Siblings(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture);
 
     /// <summary>
@@ -592,7 +592,7 @@ public static class FriendlyPublishedContentExtensions
     /// <remarks>
     ///     <para>Note that in V7 this method also return the content node self.</para>
     /// </remarks>
-    public static IEnumerable<IPublishedContent>? SiblingsOfType(this IPublishedContent content, string contentTypeAlias, string? culture = null)
+    public static IEnumerable<IPublishedContent> SiblingsOfType(this IPublishedContent content, string contentTypeAlias, string? culture = null)
         => content.SiblingsOfType(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), contentTypeAlias, culture);
 
     /// <summary>
@@ -608,7 +608,7 @@ public static class FriendlyPublishedContentExtensions
     /// <remarks>
     ///     <para>Note that in V7 this method also return the content node self.</para>
     /// </remarks>
-    public static IEnumerable<T>? Siblings<T>(this IPublishedContent content, string? culture = null)
+    public static IEnumerable<T> Siblings<T>(this IPublishedContent content, string? culture = null)
         where T : class, IPublishedContent
         => content.Siblings<T>(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture);
 
@@ -636,7 +636,7 @@ public static class FriendlyPublishedContentExtensions
     /// </param>
     /// <param name="contentTypeAlias">The content type alias.</param>
     /// <returns>The siblings of the content including the node itself, of the given content type.</returns>
-    public static IEnumerable<IPublishedContent>? SiblingsAndSelfOfType(
+    public static IEnumerable<IPublishedContent> SiblingsAndSelfOfType(
         this IPublishedContent content,
         string contentTypeAlias,
         string? culture = null)
@@ -652,7 +652,7 @@ public static class FriendlyPublishedContentExtensions
     ///     null)
     /// </param>
     /// <returns>The siblings of the content including the node itself, of the given content type.</returns>
-    public static IEnumerable<T>? SiblingsAndSelf<T>(this IPublishedContent content, string? culture = null)
+    public static IEnumerable<T> SiblingsAndSelf<T>(this IPublishedContent content, string? culture = null)
         where T : class, IPublishedContent
         => content.SiblingsAndSelf<T>(GetNavigationQueryService(content), GetPublishedStatusFilteringService(content), culture);
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
index 95b7fc0b2e..d014ceff6e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
@@ -188,7 +188,7 @@ public class ConvertersTests
         public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
             => PropertyCacheLevel.Elements;
 
-        public override object ConvertSourceToIntermediate(
+        public override object? ConvertSourceToIntermediate(
             IPublishedElement owner,
             IPublishedPropertyType propertyType,
             object source,