diff --git a/src/ElectronNET.API/API/Dialog.cs b/src/ElectronNET.API/API/Dialog.cs
index 21816463..3b9739d5 100644
--- a/src/ElectronNET.API/API/Dialog.cs
+++ b/src/ElectronNET.API/API/Dialog.cs
@@ -206,10 +206,10 @@ public Task ShowCertificateTrustDialogAsync(CertificateTrustDialogOptions option
         [SupportedOSPlatform("Windows")]
         public Task ShowCertificateTrustDialogAsync(BrowserWindow browserWindow, CertificateTrustDialogOptions options)
         {
-            var tcs = new TaskCompletionSource<object>();
+            var tcs = new TaskCompletionSource();
             string guid = Guid.NewGuid().ToString();
 
-            BridgeConnector.Socket.Once("showCertificateTrustDialogComplete" + guid, () => tcs.SetResult(null));
+            BridgeConnector.Socket.Once("showCertificateTrustDialogComplete" + guid, () => tcs.SetResult());
             BridgeConnector.Socket.Emit("showCertificateTrustDialog",
                 browserWindow,
                 options,
diff --git a/src/ElectronNET.API/API/Session.cs b/src/ElectronNET.API/API/Session.cs
index ef3b44df..a7459cb4 100644
--- a/src/ElectronNET.API/API/Session.cs
+++ b/src/ElectronNET.API/API/Session.cs
@@ -47,10 +47,10 @@ public void AllowNTLMCredentialsForDomains(string domains)
         /// <returns></returns>
         public Task ClearAuthCacheAsync(RemovePassword options)
         {
-            var tcs = new TaskCompletionSource<object>();
+            var tcs = new TaskCompletionSource();
             string guid = Guid.NewGuid().ToString();
 
-            BridgeConnector.Socket.Once("webContents-session-clearAuthCache-completed" + guid, () => tcs.SetResult(null));
+            BridgeConnector.Socket.Once("webContents-session-clearAuthCache-completed" + guid, () => tcs.SetResult());
             BridgeConnector.Socket.Emit("webContents-session-clearAuthCache", Id, options, guid);
 
             return tcs.Task;
@@ -61,10 +61,10 @@ public Task ClearAuthCacheAsync(RemovePassword options)
         /// </summary>
         public Task ClearAuthCacheAsync()
         {
-            var tcs = new TaskCompletionSource<object>();
+            var tcs = new TaskCompletionSource();
             string guid = Guid.NewGuid().ToString();
 
-            BridgeConnector.Socket.Once("webContents-session-clearAuthCache-completed" + guid, () => tcs.SetResult(null));
+            BridgeConnector.Socket.Once("webContents-session-clearAuthCache-completed" + guid, () => tcs.SetResult());
             BridgeConnector.Socket.Emit("webContents-session-clearAuthCache", Id, guid);
 
             return tcs.Task;
@@ -76,10 +76,10 @@ public Task ClearAuthCacheAsync()
         /// <returns></returns>
         public Task ClearCacheAsync()
         {
-            var tcs = new TaskCompletionSource<object>();
+            var tcs = new TaskCompletionSource();
             string guid = Guid.NewGuid().ToString();
 
-            BridgeConnector.Socket.Once("webContents-session-clearCache-completed" + guid, () => tcs.SetResult(null));
+            BridgeConnector.Socket.Once("webContents-session-clearCache-completed" + guid, () => tcs.SetResult());
             BridgeConnector.Socket.Emit("webContents-session-clearCache", Id, guid);
 
             return tcs.Task;
@@ -91,10 +91,10 @@ public Task ClearCacheAsync()
         /// <returns></returns>
         public Task ClearHostResolverCacheAsync()
         {
-            var tcs = new TaskCompletionSource<object>();
+            var tcs = new TaskCompletionSource();
             string guid = Guid.NewGuid().ToString();
 
-            BridgeConnector.Socket.Once("webContents-session-clearHostResolverCache-completed" + guid, () => tcs.SetResult(null));
+            BridgeConnector.Socket.Once("webContents-session-clearHostResolverCache-completed" + guid, () => tcs.SetResult());
             BridgeConnector.Socket.Emit("webContents-session-clearHostResolverCache", Id, guid);
 
             return tcs.Task;
@@ -106,10 +106,10 @@ public Task ClearHostResolverCacheAsync()
         /// <returns></returns>
         public Task ClearStorageDataAsync()
         {
-            var tcs = new TaskCompletionSource<object>();
+            var tcs = new TaskCompletionSource();
             string guid = Guid.NewGuid().ToString();
 
-            BridgeConnector.Socket.Once("webContents-session-clearStorageData-completed" + guid, () => tcs.SetResult(null));
+            BridgeConnector.Socket.Once("webContents-session-clearStorageData-completed" + guid, () => tcs.SetResult());
             BridgeConnector.Socket.Emit("webContents-session-clearStorageData", Id, guid);
 
             return tcs.Task;
@@ -122,10 +122,10 @@ public Task ClearStorageDataAsync()
         /// <returns></returns>
         public Task ClearStorageDataAsync(ClearStorageDataOptions options)
         {
-            var tcs = new TaskCompletionSource<object>();
+            var tcs = new TaskCompletionSource();
             string guid = Guid.NewGuid().ToString();
 
-            BridgeConnector.Socket.Once("webContents-session-clearStorageData-options-completed" + guid, () => tcs.SetResult(null));
+            BridgeConnector.Socket.Once("webContents-session-clearStorageData-options-completed" + guid, () => tcs.SetResult());
             BridgeConnector.Socket.Emit("webContents-session-clearStorageData-options", Id, options, guid);
 
             return tcs.Task;
@@ -276,10 +276,10 @@ public void SetPreloads(string[] preloads)
         /// <returns></returns>
         public Task SetProxyAsync(ProxyConfig config)
         {
-            var tcs = new TaskCompletionSource<object>();
+            var tcs = new TaskCompletionSource();
             string guid = Guid.NewGuid().ToString();
 
-            BridgeConnector.Socket.Once("webContents-session-setProxy-completed" + guid, () => tcs.SetResult(null));
+            BridgeConnector.Socket.Once("webContents-session-setProxy-completed" + guid, () => tcs.SetResult());
             BridgeConnector.Socket.Emit("webContents-session-setProxy", Id, config, guid);
 
             return tcs.Task;
diff --git a/src/ElectronNET.API/API/Shell.cs b/src/ElectronNET.API/API/Shell.cs
index e8acb0ee..4c99de84 100644
--- a/src/ElectronNET.API/API/Shell.cs
+++ b/src/ElectronNET.API/API/Shell.cs
@@ -42,13 +42,9 @@ internal static Shell Instance
         /// <param name="fullPath">The full path to the directory / file.</param>
         public Task ShowItemInFolderAsync(string fullPath)
         {
-            var tcs = new TaskCompletionSource<object>();
-
-            // Is this really useful?
-            BridgeConnector.Socket.Once("shell-showItemInFolderCompleted", () => { });
             BridgeConnector.Socket.Emit("shell-showItemInFolder", fullPath);
 
-            return tcs.Task;
+            return Task.CompletedTask;
         }
 
         /// <summary>
diff --git a/src/ElectronNET.API/API/WebContents.cs b/src/ElectronNET.API/API/WebContents.cs
index 2ded9f60..fb95876d 100644
--- a/src/ElectronNET.API/API/WebContents.cs
+++ b/src/ElectronNET.API/API/WebContents.cs
@@ -254,12 +254,12 @@ public Task LoadURLAsync(string url)
     /// <param name="options"></param>
     public Task LoadURLAsync(string url, LoadURLOptions options)
     {
-        var tcs = new TaskCompletionSource<object>();
+        var tcs = new TaskCompletionSource();
 
         BridgeConnector.Socket.Once("webContents-loadURL-complete" + Id, () =>
         {
             BridgeConnector.Socket.Off("webContents-loadURL-error" + Id);
-            tcs.SetResult(null);
+            tcs.SetResult();
         });
 
         BridgeConnector.Socket.Once<string>("webContents-loadURL-error" + Id, (error) => { tcs.SetException(new InvalidOperationException(error)); });
diff --git a/src/ElectronNET.API/Bridge/SocketIOFacade.cs b/src/ElectronNET.API/Bridge/SocketIOFacade.cs
index 06015a0a..4db0a0b7 100644
--- a/src/ElectronNET.API/Bridge/SocketIOFacade.cs
+++ b/src/ElectronNET.API/Bridge/SocketIOFacade.cs
@@ -2,12 +2,10 @@
 // ReSharper disable once CheckNamespace
 namespace ElectronNET.API;
 
-using ElectronNET.API.Serialization;
-using SocketIO.Serializer.SystemTextJson;
 using System;
-using System.Linq;
-using System.Text.Json;
 using System.Threading.Tasks;
+using ElectronNET.API.Serialization;
+using SocketIO.Serializer.SystemTextJson;
 using SocketIO = SocketIOClient.SocketIO;
 
 internal class SocketIoFacade
@@ -66,20 +64,6 @@ public void On<T>(string eventName, Action<T> action)
         }
     }
 
-    // Keep object overload for compatibility; value will be a JsonElement boxed as object.
-    public void On(string eventName, Action<object> action)
-    {
-        lock (_lockObj)
-        {
-            _socket.On(eventName, response =>
-            {
-                var value = (object)response.GetValue<JsonElement>();
-                ////Console.WriteLine($"Called Event {eventName} - data {value}");
-                Task.Run(() => action(value));
-            });
-        }
-    }
-
     public void Once(string eventName, Action action)
     {
         lock (_lockObj)
diff --git a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
index 11ad090d..cb0fcfd8 100644
--- a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
+++ b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
@@ -16,6 +16,7 @@
     <ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
     <PublishTrimmed>False</PublishTrimmed>
     <NuGetAudit>false</NuGetAudit>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
   <PropertyGroup Label="ElectronNetCommon">
     <PackageIcon>128.png</PackageIcon>
diff --git a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
index 9b849f89..becdb57d 100644
--- a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
+++ b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
@@ -45,6 +45,7 @@
   <PropertyGroup>
     <TypeScriptCompileOnSaveEnabled>true</TypeScriptCompileOnSaveEnabled>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="publish\**" />
diff --git a/src/ElectronNET/ElectronNET.csproj b/src/ElectronNET/ElectronNET.csproj
index 48abf453..2298cd7e 100644
--- a/src/ElectronNET/ElectronNET.csproj
+++ b/src/ElectronNET/ElectronNET.csproj
@@ -10,6 +10,7 @@
     <Description>$(DescriptionFirstPart) This package contains the ElectronNET project system.</Description>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <IncludeSymbols>false</IncludeSymbols>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <None Include="PackageIcon.png" Pack="true" PackagePath="\" />