diff --git a/src/Playwright/Core/APIRequest.cs b/src/Playwright/Core/APIRequest.cs
index 342f067df9..1e676c3e5b 100644
--- a/src/Playwright/Core/APIRequest.cs
+++ b/src/Playwright/Core/APIRequest.cs
@@ -27,7 +27,6 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Core;
 
@@ -67,9 +66,9 @@ async Task<IAPIRequestContext> IAPIRequest.NewContextAsync(APIRequestNewContextO
             args.Add("storageState", JsonSerializer.Deserialize<StorageState>(storageState, Helpers.JsonExtensions.DefaultJsonSerializerOptions));
         }
 
-        var context = (await _playwright.SendMessageToServerAsync<APIRequestContextChannel>(
+        var context = await _playwright.SendMessageToServerAsync<APIRequestContext>(
             "newRequest",
-            args).ConfigureAwait(false)).Object;
+            args).ConfigureAwait(false);
         context._request = this;
         return context;
     }
diff --git a/src/Playwright/Core/APIRequestContext.cs b/src/Playwright/Core/APIRequestContext.cs
index 90feac8490..e10f64b03f 100644
--- a/src/Playwright/Core/APIRequestContext.cs
+++ b/src/Playwright/Core/APIRequestContext.cs
@@ -31,28 +31,21 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class APIRequestContext : ChannelOwnerBase, IChannelOwner<APIRequestContext>, IAPIRequestContext
+internal class APIRequestContext : ChannelOwnerBase, IAPIRequestContext
 {
-    internal readonly APIRequestContextChannel _channel;
     internal readonly Tracing _tracing;
 
     internal APIRequest _request;
 
-    public APIRequestContext(IChannelOwner parent, string guid, APIRequestContextInitializer initializer) : base(parent, guid)
+    public APIRequestContext(ChannelOwnerBase parent, string guid, APIRequestContextInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         _tracing = initializer.Tracing;
     }
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<APIRequestContext> IChannelOwner<APIRequestContext>.Channel => _channel;
-
     [MethodImpl(MethodImplOptions.NoInlining)]
     public ValueTask DisposeAsync() => new(SendMessageToServerAsync("dispose"));
 
diff --git a/src/Playwright/Core/Accessibility.cs b/src/Playwright/Core/Accessibility.cs
index 474cc36280..9c2d6c1938 100644
--- a/src/Playwright/Core/Accessibility.cs
+++ b/src/Playwright/Core/Accessibility.cs
@@ -25,26 +25,25 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Core;
 
 internal class Accessibility : IAccessibility
 {
-    private readonly PageChannel _channel;
+    private readonly Page _page;
 
-    public Accessibility(PageChannel channel)
+    public Accessibility(Page page)
     {
-        _channel = channel;
+        _page = page;
     }
 
     public async Task<JsonElement?> SnapshotAsync(AccessibilitySnapshotOptions options = default)
     {
         options ??= new();
-        if ((await _channel.Object.SendMessageToServerAsync("accessibilitySnapshot", new Dictionary<string, object>
+        if ((await _page.SendMessageToServerAsync("accessibilitySnapshot", new Dictionary<string, object>
         {
             ["interestingOnly"] = options?.InterestingOnly,
-            ["root"] = (options.Root as ElementHandle)?.ElementChannel,
+            ["root"] = options.Root,
         }).ConfigureAwait(false)).Value.TryGetProperty("rootAXNode", out var jsonElement))
         {
             return jsonElement;
diff --git a/src/Playwright/Core/AndroidDevice.cs b/src/Playwright/Core/AndroidDevice.cs
index 9baf6fb9ed..05ef136231 100644
--- a/src/Playwright/Core/AndroidDevice.cs
+++ b/src/Playwright/Core/AndroidDevice.cs
@@ -23,14 +23,13 @@
  */
 
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
 internal class AndroidDevice : ChannelOwnerBase
 {
-    internal AndroidDevice(IChannelOwner parent, string guid, BrowserInitializer initializer) : base(parent, guid)
+    internal AndroidDevice(ChannelOwnerBase parent, string guid, BrowserInitializer initializer) : base(parent, guid)
     {
     }
 }
diff --git a/src/Playwright/Core/Artifact.cs b/src/Playwright/Core/Artifact.cs
index 269d75b426..101ef351b2 100644
--- a/src/Playwright/Core/Artifact.cs
+++ b/src/Playwright/Core/Artifact.cs
@@ -29,27 +29,17 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Artifact : ChannelOwnerBase, IChannelOwner<Artifact>
+internal class Artifact : ChannelOwnerBase
 {
-    private readonly ArtifactChannel _channel;
-
-    internal Artifact(IChannelOwner parent, string guid, ArtifactInitializer initializer) : base(parent, guid)
+    internal Artifact(ChannelOwnerBase parent, string guid, ArtifactInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         AbsolutePath = initializer.AbsolutePath;
     }
 
-    Connection IChannelOwner.Connection => _connection;
-
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Artifact> IChannelOwner<Artifact>.Channel => _channel;
-
     internal string AbsolutePath { get; }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
diff --git a/src/Playwright/Core/BindingCall.cs b/src/Playwright/Core/BindingCall.cs
index 7da41e4000..d102fbc081 100644
--- a/src/Playwright/Core/BindingCall.cs
+++ b/src/Playwright/Core/BindingCall.cs
@@ -29,30 +29,23 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class BindingCall : ChannelOwnerBase, IChannelOwner<BindingCall>
+internal class BindingCall : ChannelOwnerBase
 {
     private static readonly Type VoidTaskResultType = Type.GetType("System.Threading.Tasks.VoidTaskResult");
 
-    private readonly BindingCallChannel _channel;
     private readonly BindingCallInitializer _initializer;
 
-    public BindingCall(IChannelOwner parent, string guid, BindingCallInitializer initializer) : base(parent, guid)
+    public BindingCall(ChannelOwnerBase parent, string guid, BindingCallInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         _initializer = initializer;
     }
 
     public string Name => _initializer.Name;
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<BindingCall> IChannelOwner<BindingCall>.Channel => _channel;
-
     internal async Task CallAsync(Delegate binding)
     {
         try
diff --git a/src/Playwright/Core/Browser.cs b/src/Playwright/Core/Browser.cs
index e05885af0b..7d6ebce455 100644
--- a/src/Playwright/Core/Browser.cs
+++ b/src/Playwright/Core/Browser.cs
@@ -32,12 +32,11 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Browser : ChannelOwnerBase, IChannelOwner<Browser>, IBrowser
+internal class Browser : ChannelOwnerBase, IBrowser
 {
     private readonly BrowserInitializer _initializer;
     private readonly TaskCompletionSource<bool> _closedTcs = new();
@@ -45,19 +44,14 @@ internal class Browser : ChannelOwnerBase, IChannelOwner<Browser>, IBrowser
     internal BrowserType _browserType;
     internal string _closeReason;
 
-    internal Browser(IChannelOwner parent, string guid, BrowserInitializer initializer) : base(parent, guid)
+    internal Browser(ChannelOwnerBase parent, string guid, BrowserInitializer initializer) : base(parent, guid)
     {
-        Channel = new(guid, parent.Connection, this);
         IsConnected = true;
         _initializer = initializer;
     }
 
     public event EventHandler<IBrowser> Disconnected;
 
-    ChannelBase IChannelOwner.Channel => Channel;
-
-    IChannel<Browser> IChannelOwner<Browser>.Channel => Channel;
-
     public IReadOnlyList<IBrowserContext> Contexts => _contexts.ToArray();
 
     public bool IsConnected { get; private set; }
@@ -66,8 +60,6 @@ internal Browser(IChannelOwner parent, string guid, BrowserInitializer initializ
 
     public string Version => _initializer.Version;
 
-    internal BrowserChannel Channel { get; }
-
     public IBrowserType BrowserType => _browserType;
 
     internal override void OnMessage(string method, JsonElement? serverParams)
@@ -88,11 +80,11 @@ public async Task CloseAsync(BrowserCloseOptions options = default)
         {
             if (ShouldCloseConnectionOnClose)
             {
-                Channel.Connection.DoClose();
+                _connection.DoClose();
             }
             else
             {
-                await SendMessageToServerAsync<BrowserContextChannel>("close", new Dictionary<string, object>
+                await SendMessageToServerAsync("close", new Dictionary<string, object>
                 {
                     ["reason"] = options?.Reason,
                 }).ConfigureAwait(false);
@@ -175,7 +167,7 @@ public async Task<IBrowserContext> NewContextAsync(BrowserNewContextOptions opti
             args.Add("screen", options.ScreenSize);
         }
 
-        var context = (await SendMessageToServerAsync<BrowserContextChannel>("newContext", args).ConfigureAwait(false)).Object;
+        var context = await SendMessageToServerAsync<BrowserContext>("newContext", args).ConfigureAwait(false);
 
         _browserType.DidCreateContext(context, options, null);
         return context;
@@ -274,8 +266,8 @@ internal void DidClose()
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<ICDPSession> NewBrowserCDPSessionAsync()
-        => (await SendMessageToServerAsync<CDPChannel>(
-        "newBrowserCDPSession").ConfigureAwait(false)).Object;
+        => await SendMessageToServerAsync<CDPSession>(
+        "newBrowserCDPSession").ConfigureAwait(false);
 
     internal static Dictionary<string, object> PrepareHarOptions(
         HarContentPolicy? recordHarContent,
diff --git a/src/Playwright/Core/BrowserContext.cs b/src/Playwright/Core/BrowserContext.cs
index 3202711518..5794d17a4c 100644
--- a/src/Playwright/Core/BrowserContext.cs
+++ b/src/Playwright/Core/BrowserContext.cs
@@ -38,7 +38,7 @@
 
 namespace Microsoft.Playwright.Core;
 
-internal class BrowserContext : ChannelOwnerBase, IChannelOwner<BrowserContext>, IBrowserContext
+internal class BrowserContext : ChannelOwnerBase, IBrowserContext
 {
     private readonly TaskCompletionSource<bool> _closeTcs = new();
     private readonly Dictionary<string, Delegate> _bindings = new();
@@ -55,11 +55,10 @@ internal class BrowserContext : ChannelOwnerBase, IChannelOwner<BrowserContext>,
 
     internal TimeoutSettings _timeoutSettings = new();
 
-    internal BrowserContext(IChannelOwner parent, string guid, BrowserContextInitializer initializer) : base(parent, guid)
+    internal BrowserContext(ChannelOwnerBase parent, string guid, BrowserContextInitializer initializer) : base(parent, guid)
     {
         _browser = parent as Browser;
         _browser?._contexts.Add(this);
-        Channel = new(guid, parent.Connection, this);
 
         _tracing = initializer.Tracing;
         _request = initializer.RequestContext;
@@ -128,16 +127,10 @@ public ITracing Tracing
         set => throw new NotSupportedException();
     }
 
-    ChannelBase IChannelOwner.Channel => Channel;
-
-    IChannel<BrowserContext> IChannelOwner<BrowserContext>.Channel => Channel;
-
     public IBrowser Browser => _browser;
 
     public IReadOnlyList<IPage> Pages => _pages;
 
-    internal BrowserContextChannel Channel { get; }
-
     internal Page OwnerPage { get; set; }
 
     internal bool IsChromium => _initializer.IsChromium;
@@ -157,10 +150,10 @@ internal override void OnMessage(string method, JsonElement? serverParams)
                 break;
             case "bindingCall":
                 Channel_BindingCall(
-                    serverParams?.GetProperty("binding").ToObject<BindingCallChannel>(_connection.DefaultJsonSerializerOptions).Object);
+                    serverParams?.GetProperty("binding").ToObject<BindingCall>(_connection.DefaultJsonSerializerOptions));
                 break;
             case "dialog":
-                OnDialog(serverParams?.GetProperty("dialog").ToObject<DialogChannel>(_connection.DefaultJsonSerializerOptions).Object);
+                OnDialog(serverParams?.GetProperty("dialog").ToObject<Dialog>(_connection.DefaultJsonSerializerOptions));
                 break;
             case "console":
                 var consoleMessage = new ConsoleMessage(serverParams?.ToObject<BrowserContextConsoleEvent>(_connection.DefaultJsonSerializerOptions));
@@ -171,19 +164,18 @@ internal override void OnMessage(string method, JsonElement? serverParams)
                 }
                 break;
             case "route":
-                var route = serverParams?.GetProperty("route").ToObject<RouteChannel>(_connection.DefaultJsonSerializerOptions).Object;
+                var route = serverParams?.GetProperty("route").ToObject<Route>(_connection.DefaultJsonSerializerOptions);
                 Channel_Route(this, route);
                 break;
             case "page":
                 Channel_OnPage(
                     this,
-                    serverParams?.GetProperty("page").ToObject<PageChannel>(_connection.DefaultJsonSerializerOptions));
+                    serverParams?.GetProperty("page").ToObject<Page>(_connection.DefaultJsonSerializerOptions));
                 break;
             case "pageError":
                 {
                     var error = serverParams?.GetProperty("error").ToObject<SerializedError>(_connection.DefaultJsonSerializerOptions);
-                    var pageChannel = serverParams?.GetProperty("page").ToObject<PageChannel>(_connection.DefaultJsonSerializerOptions);
-                    var pageObject = pageChannel?.Object;
+                    var pageObject = serverParams?.GetProperty("page").ToObject<Page>(_connection.DefaultJsonSerializerOptions);
                     var parsedError = string.IsNullOrEmpty(error.Error.Stack) ? $"{error.Error.Name}: {error.Error.Message}" : error.Error.Stack;
                     WebError?.Invoke(this, new WebError(pageObject, parsedError));
                     pageObject?.FirePageError(parsedError);
@@ -191,7 +183,7 @@ internal override void OnMessage(string method, JsonElement? serverParams)
                 }
             case "serviceWorker":
                 {
-                    var serviceWorker = serverParams?.GetProperty("worker").ToObject<WorkerChannel>(_connection.DefaultJsonSerializerOptions).Object;
+                    var serviceWorker = serverParams?.GetProperty("worker").ToObject<Worker>(_connection.DefaultJsonSerializerOptions);
                     ((Worker)serviceWorker).Context = this;
                     _serviceWorkers.Add(serviceWorker);
                     ServiceWorker?.Invoke(this, serviceWorker);
@@ -260,7 +252,7 @@ internal void OnDialog(IDialog dialog)
     }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
-    public Task AddCookiesAsync(IEnumerable<Cookie> cookies) => SendMessageToServerAsync<PageChannel>(
+    public Task AddCookiesAsync(IEnumerable<Cookie> cookies) => SendMessageToServerAsync(
             "addCookies",
             new Dictionary<string, object>
             {
@@ -275,7 +267,7 @@ public Task AddInitScriptAsync(string script = null, string scriptPath = null)
             script = ScriptsHelper.EvaluationScript(script, scriptPath);
         }
 
-        return SendMessageToServerAsync<PageChannel>(
+        return SendMessageToServerAsync(
             "addInitScript",
             new Dictionary<string, object>
             {
@@ -315,7 +307,7 @@ await WrapApiCallAsync(
                 if (isCompressed && !needCompressed)
                 {
                     await artifact.SaveAsAsync(harRecorder.Value.Path + ".tmp").ConfigureAwait(false);
-                    await Channel.Connection.LocalUtils.HarUnzipAsync(harRecorder.Value.Path + ".tmp", harRecorder.Value.Path).ConfigureAwait(false);
+                    await _connection.LocalUtils.HarUnzipAsync(harRecorder.Value.Path + ".tmp", harRecorder.Value.Path).ConfigureAwait(false);
                 }
                 else
                 {
@@ -416,7 +408,7 @@ public Task ExposeFunctionAsync<T1, T2, T3, T4, TResult>(string name, Func<T1, T
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public Task GrantPermissionsAsync(IEnumerable<string> permissions, BrowserContextGrantPermissionsOptions options = default)
-        => SendMessageToServerAsync<PageChannel>("grantPermissions", new Dictionary<string, object>
+        => SendMessageToServerAsync("grantPermissions", new Dictionary<string, object>
         {
             ["permissions"] = permissions?.ToArray(),
             ["origin"] = options?.Origin,
@@ -424,21 +416,21 @@ public Task GrantPermissionsAsync(IEnumerable<string> permissions, BrowserContex
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<ICDPSession> NewCDPSessionAsync(IPage page)
-        => (await SendMessageToServerAsync<CDPChannel>(
+        => await SendMessageToServerAsync<CDPSession>(
         "newCDPSession",
         new Dictionary<string, object>
         {
             ["page"] = new { guid = (page as Page).Guid },
-        }).ConfigureAwait(false)).Object;
+        }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<ICDPSession> NewCDPSessionAsync(IFrame frame)
-        => (await SendMessageToServerAsync<CDPChannel>(
+        => await SendMessageToServerAsync<CDPSession>(
         "newCDPSession",
         new Dictionary<string, object>
         {
             ["frame"] = new { guid = (frame as Frame).Guid },
-        }).ConfigureAwait(false)).Object;
+        }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IPage> NewPageAsync()
@@ -448,7 +440,7 @@ public async Task<IPage> NewPageAsync()
             throw new PlaywrightException("Please use Browser.NewContextAsync()");
         }
 
-        return (await SendMessageToServerAsync<PageChannel>("newPage").ConfigureAwait(false)).Object;
+        return await SendMessageToServerAsync<Page>("newPage").ConfigureAwait(false);
     }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
@@ -485,7 +477,7 @@ public Task SetExtraHTTPHeadersAsync(IEnumerable<KeyValuePair<string, string>> h
             });
 
     [MethodImpl(MethodImplOptions.NoInlining)]
-    public Task SetGeolocationAsync(Geolocation geolocation) => SendMessageToServerAsync<PageChannel>(
+    public Task SetGeolocationAsync(Geolocation geolocation) => SendMessageToServerAsync(
             "setGeolocation",
             new Dictionary<string, object>
             {
@@ -493,7 +485,7 @@ public Task SetGeolocationAsync(Geolocation geolocation) => SendMessageToServerA
             });
 
     [MethodImpl(MethodImplOptions.NoInlining)]
-    public Task SetOfflineAsync(bool offline) => SendMessageToServerAsync<PageChannel>(
+    public Task SetOfflineAsync(bool offline) => SendMessageToServerAsync(
             "setOffline",
             new Dictionary<string, object>
             {
@@ -596,7 +588,7 @@ internal void SetDefaultNavigationTimeoutImpl(float? timeout)
     {
         _timeoutSettings.SetDefaultNavigationTimeout(timeout);
         WrapApiCallAsync(
-            () => SendMessageToServerAsync<PageChannel>(
+            () => SendMessageToServerAsync(
             "setDefaultNavigationTimeoutNoReply",
             new Dictionary<string, object>
             {
@@ -612,7 +604,7 @@ internal void SetDefaultTimeoutImpl(float? timeout)
     {
         _timeoutSettings.SetDefaultTimeout(timeout);
         WrapApiCallAsync(
-            () => SendMessageToServerAsync<PageChannel>(
+            () => SendMessageToServerAsync(
             "setDefaultTimeoutNoReply",
             new Dictionary<string, object>
             {
@@ -726,9 +718,8 @@ internal void OnClose()
         _closeTcs.TrySetResult(true);
     }
 
-    private void Channel_OnPage(object sender, PageChannel pageChannel)
+    private void Channel_OnPage(object sender, Page page)
     {
-        var page = pageChannel.Object;
         page.Context = this;
         _pages.Add(page);
         Page?.Invoke(this, page);
@@ -766,7 +757,7 @@ private Task ExposeBindingAsync(string name, Delegate callback, bool handle = fa
 
         _bindings.Add(name, callback);
 
-        return SendMessageToServerAsync<PageChannel>(
+        return SendMessageToServerAsync(
             "exposeBinding",
             new Dictionary<string, object>
             {
@@ -793,7 +784,7 @@ internal async Task RecordIntoHarAsync(string har, Page page, BrowserContextRout
         var contentPolicy = RouteFromHarUpdateContentPolicyToHarContentPolicy(options?.UpdateContent);
         var harId = (await SendMessageToServerAsync("harStart", new Dictionary<string, object>
             {
-                { "page", page?.Channel },
+                { "page", page },
                 { "options", Core.Browser.PrepareHarOptions(contentPolicy ?? HarContentPolicy.Attach, options.UpdateMode ?? HarMode.Minimal, har, null, options.Url, options.UrlString, options.UrlRegex) },
             }).ConfigureAwait(false)).GetString("harId", false);
         _harRecorders.Add(harId, new() { Path = har, Content = contentPolicy ?? HarContentPolicy.Attach });
@@ -807,7 +798,7 @@ public async Task RouteFromHARAsync(string har, BrowserContextRouteFromHAROption
             await RecordIntoHarAsync(har, null, options).ConfigureAwait(false);
             return;
         }
-        var harRouter = await HarRouter.CreateAsync(Channel.Connection.LocalUtils, har, options?.NotFound ?? HarNotFound.Abort, new()
+        var harRouter = await HarRouter.CreateAsync(_connection.LocalUtils, har, options?.NotFound ?? HarNotFound.Abort, new()
         {
             Url = options?.Url,
             UrlRegex = options?.UrlRegex,
diff --git a/src/Playwright/Core/BrowserType.cs b/src/Playwright/Core/BrowserType.cs
index c1b92c5b32..f704d53bec 100644
--- a/src/Playwright/Core/BrowserType.cs
+++ b/src/Playwright/Core/BrowserType.cs
@@ -30,26 +30,19 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class BrowserType : ChannelOwnerBase, IChannelOwner<BrowserType>, IBrowserType
+internal class BrowserType : ChannelOwnerBase, IBrowserType
 {
     private readonly BrowserTypeInitializer _initializer;
-    private readonly BrowserTypeChannel _channel;
 
-    internal BrowserType(IChannelOwner parent, string guid, BrowserTypeInitializer initializer) : base(parent, guid)
+    internal BrowserType(ChannelOwnerBase parent, string guid, BrowserTypeInitializer initializer) : base(parent, guid)
     {
         _initializer = initializer;
-        _channel = new(guid, parent.Connection, this);
     }
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<BrowserType> IChannelOwner<BrowserType>.Channel => _channel;
-
     internal PlaywrightImpl Playwright { get; set; }
 
     public string ExecutablePath => _initializer.ExecutablePath;
@@ -60,7 +53,7 @@ internal BrowserType(IChannelOwner parent, string guid, BrowserTypeInitializer i
     public async Task<IBrowser> LaunchAsync(BrowserTypeLaunchOptions options = default)
     {
         options ??= new BrowserTypeLaunchOptions();
-        Browser browser = (await SendMessageToServerAsync<BrowserChannel>(
+        Browser browser = await SendMessageToServerAsync<Browser>(
             "launch",
             new Dictionary<string, object>
             {
@@ -82,7 +75,7 @@ public async Task<IBrowser> LaunchAsync(BrowserTypeLaunchOptions options = defau
                 { "chromiumSandbox", options.ChromiumSandbox },
                 { "slowMo", options.ChromiumSandbox },
                 { "timeout", options.Timeout },
-            }).ConfigureAwait(false)).Object;
+            }).ConfigureAwait(false);
         DidLaunchBrowser(browser);
         return browser;
     }
@@ -158,7 +151,7 @@ public async Task<IBrowserContext> LaunchPersistentContextAsync(string userDataD
             channelArgs.Add("viewport", options.ViewportSize);
         }
 
-        var context = (await SendMessageToServerAsync<BrowserContextChannel>("launchPersistentContext", channelArgs).ConfigureAwait(false)).Object;
+        var context = await SendMessageToServerAsync<BrowserContext>("launchPersistentContext", channelArgs).ConfigureAwait(false);
 
         // TODO: unite with a single browser context options type which is derived from channels
         DidCreateContext(
@@ -188,7 +181,7 @@ public async Task<IBrowser> ConnectAsync(string wsEndpoint, BrowserTypeConnectOp
             {
                 new KeyValuePair<string, string>("x-playwright-browser", Name),
             }.ToDictionary(pair => pair.Key, pair => pair.Value);
-        var localUtils = _channel.Connection.LocalUtils;
+        var localUtils = _connection.LocalUtils;
         var pipe = await localUtils.ConnectAsync(wsEndpoint: wsEndpoint, headers: headers, slowMo: options.SlowMo, timeout: options.Timeout, exposeNetwork: options.ExposeNetwork).ConfigureAwait(false);
 
         void ClosePipe()
@@ -196,7 +189,7 @@ void ClosePipe()
             pipe.CloseAsync().IgnoreException();
         }
 #pragma warning disable CA2000 // Dispose objects before losing scope
-        var connection = new Connection(_channel.Connection.LocalUtils);
+        var connection = new Connection(_connection.LocalUtils);
 #pragma warning restore CA2000
         connection.MarkAsRemote();
         connection.Close += (_, _) => ClosePipe();
@@ -243,7 +236,7 @@ void OnPipeClosed()
             catch (Exception ex)
             {
                 closeError = ex;
-                _channel.Connection.TraceMessage("pw:dotnet", $"Dispatching error: {ex.Message}\n{ex.StackTrace}");
+                _connection.TraceMessage("pw:dotnet", $"Dispatching error: {ex.Message}\n{ex.StackTrace}");
                 ClosePipe();
             }
         };
@@ -283,11 +276,11 @@ public async Task<IBrowser> ConnectOverCDPAsync(string endpointURL, BrowserTypeC
                 { "slowMo", options.SlowMo },
                 { "timeout", options.Timeout },
             }).ConfigureAwait(false);
-        Browser browser = result.GetProperty("browser").ToObject<Browser>(_channel.Connection.DefaultJsonSerializerOptions);
+        Browser browser = result.GetProperty("browser").ToObject<Browser>(_connection.DefaultJsonSerializerOptions);
         DidLaunchBrowser(browser);
         if (result.TryGetProperty("defaultContext", out JsonElement defaultContextValue))
         {
-            var defaultContext = defaultContextValue.ToObject<BrowserContext>(_channel.Connection.DefaultJsonSerializerOptions);
+            var defaultContext = defaultContextValue.ToObject<BrowserContext>(_connection.DefaultJsonSerializerOptions);
             DidCreateContext(defaultContext, new(), null);
         }
         return browser;
diff --git a/src/Playwright/Core/CDPSession.cs b/src/Playwright/Core/CDPSession.cs
index 5e73b08883..cf1a23f5d7 100644
--- a/src/Playwright/Core/CDPSession.cs
+++ b/src/Playwright/Core/CDPSession.cs
@@ -27,26 +27,19 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 
 #nullable enable
 
 namespace Microsoft.Playwright.Core;
 
-internal class CDPSession : ChannelOwnerBase, ICDPSession, IChannelOwner<CDPSession>
+internal class CDPSession : ChannelOwnerBase, ICDPSession
 {
-    private readonly CDPChannel _channel;
     private readonly Dictionary<string, CDPSessionEvent> _cdpSessionEvents = new();
 
-    public CDPSession(IChannelOwner parent, string guid) : base(parent, guid)
+    public CDPSession(ChannelOwnerBase parent, string guid) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
     }
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<CDPSession> IChannelOwner<CDPSession>.Channel => _channel;
-
     internal override void OnMessage(string method, JsonElement? serverParams)
     {
         switch (method)
diff --git a/src/Playwright/Core/Dialog.cs b/src/Playwright/Core/Dialog.cs
index 9e15123ae8..90224b8565 100644
--- a/src/Playwright/Core/Dialog.cs
+++ b/src/Playwright/Core/Dialog.cs
@@ -26,19 +26,16 @@
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Dialog : ChannelOwnerBase, IChannelOwner<Dialog>, IDialog
+internal class Dialog : ChannelOwnerBase, IDialog
 {
-    private readonly DialogChannel _channel;
     private readonly DialogInitializer _initializer;
 
-    public Dialog(IChannelOwner parent, string guid, DialogInitializer initializer) : base(parent, guid)
+    public Dialog(ChannelOwnerBase parent, string guid, DialogInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         _initializer = initializer;
     }
 
@@ -52,12 +49,8 @@ public Dialog(IChannelOwner parent, string guid, DialogInitializer initializer)
     // Therefore, we must report the dialog without a page to be able to handle it.
     public IPage Page => _initializer.Page;
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Dialog> IChannelOwner<Dialog>.Channel => _channel;
-
     [MethodImpl(MethodImplOptions.NoInlining)]
-    public Task AcceptAsync(string promptText) => SendMessageToServerAsync<PageChannel>(
+    public Task AcceptAsync(string promptText) => SendMessageToServerAsync(
             "accept",
             new Dictionary<string, object>
             {
diff --git a/src/Playwright/Core/ElementHandle.cs b/src/Playwright/Core/ElementHandle.cs
index 5a138d2134..4b9dffc1c2 100644
--- a/src/Playwright/Core/ElementHandle.cs
+++ b/src/Playwright/Core/ElementHandle.cs
@@ -29,26 +29,18 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
-using Microsoft.Playwright.Transport.Channels;
+using Microsoft.Playwright.Transport;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class ElementHandle : JSHandle, IElementHandle, IChannelOwner<ElementHandle>
+internal class ElementHandle : JSHandle, IElementHandle
 {
-    private readonly ElementHandleChannel _channel;
 
-    internal ElementHandle(IChannelOwner parent, string guid, ElementHandleInitializer initializer) : base(parent, guid, initializer)
+    internal ElementHandle(ChannelOwnerBase parent, string guid, ElementHandleInitializer initializer) : base(parent, guid, initializer)
     {
-        _channel = new(guid, parent.Connection, this);
     }
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<ElementHandle> IChannelOwner<ElementHandle>.Channel => _channel;
-
-    internal IChannel<ElementHandle> ElementChannel => _channel;
-
     internal override void OnMessage(string method, JsonElement? serverParams)
     {
         switch (method)
@@ -60,7 +52,7 @@ internal override void OnMessage(string method, JsonElement? serverParams)
     }
 
     public async Task<IElementHandle> WaitForSelectorAsync(string selector, ElementHandleWaitForSelectorOptions options = default)
-        => (await SendMessageToServerAsync<ElementHandleChannel>(
+        => await SendMessageToServerAsync<ElementHandle>(
             "waitForSelector",
             new Dictionary<string, object>
             {
@@ -68,7 +60,7 @@ public async Task<IElementHandle> WaitForSelectorAsync(string selector, ElementH
                 ["timeout"] = options?.Timeout,
                 ["state"] = options?.State,
                 ["strict"] = options?.Strict,
-            }).ConfigureAwait(false)).Object;
+            }).ConfigureAwait(false);
 
     public Task WaitForElementStateAsync(ElementState state, ElementHandleWaitForElementStateOptions options = default)
         => SendMessageToServerAsync("waitForElementState", new Dictionary<string, object>
@@ -119,7 +111,7 @@ public async Task<byte[]> ScreenshotAsync(ElementHandleScreenshotOptions options
         {
             args["mask"] = options.Mask.Select(locator => new Dictionary<string, object>
             {
-                ["frame"] = ((Locator)locator)._frame._channel,
+                ["frame"] = ((Locator)locator)._frame,
                 ["selector"] = ((Locator)locator)._selector,
             }).ToArray();
         }
@@ -144,7 +136,7 @@ public Task FillAsync(string value, ElementHandleFillOptions options = default)
             ["noWaitAfter"] = options?.NoWaitAfter,
         });
 
-    public async Task<IFrame> ContentFrameAsync() => (await SendMessageToServerAsync<FrameChannel>("contentFrame").ConfigureAwait(false))?.Object;
+    public async Task<IFrame> ContentFrameAsync() => await SendMessageToServerAsync<Frame>("contentFrame").ConfigureAwait(false);
 
     public Task HoverAsync(ElementHandleHoverOptions options = default)
         => SendMessageToServerAsync<JsonElement?>("hover", new Dictionary<string, object>
@@ -158,12 +150,12 @@ public Task HoverAsync(ElementHandleHoverOptions options = default)
         });
 
     public Task ScrollIntoViewIfNeededAsync(ElementHandleScrollIntoViewIfNeededOptions options = default)
-        => SendMessageToServerAsync<ElementHandleChannel>("scrollIntoViewIfNeeded", new Dictionary<string, object>
+        => SendMessageToServerAsync("scrollIntoViewIfNeeded", new Dictionary<string, object>
         {
             ["timeout"] = options?.Timeout,
         });
 
-    public async Task<IFrame> OwnerFrameAsync() => (await SendMessageToServerAsync<FrameChannel>("ownerFrame").ConfigureAwait(false)).Object;
+    public async Task<IFrame> OwnerFrameAsync() => await SendMessageToServerAsync<Frame>("ownerFrame").ConfigureAwait(false);
 
     public async Task<ElementHandleBoundingBoxResult> BoundingBoxAsync()
     {
@@ -240,20 +232,20 @@ public async Task SetInputFilesAsync(IEnumerable<FilePayload> files, ElementHand
     }
 
     public async Task<IElementHandle> QuerySelectorAsync(string selector)
-        => (await SendMessageToServerAsync<ElementHandleChannel>(
+        => await SendMessageToServerAsync<ElementHandle>(
             "querySelector",
             new Dictionary<string, object>
             {
                 ["selector"] = selector,
-            }).ConfigureAwait(false))?.Object;
+            }).ConfigureAwait(false);
 
     public async Task<IReadOnlyList<IElementHandle>> QuerySelectorAllAsync(string selector)
-        => (await SendMessageToServerAsync<ChannelBase[]>(
+        => (await SendMessageToServerAsync<ElementHandle[]>(
             "querySelectorAll",
             new Dictionary<string, object>
             {
                 ["selector"] = selector,
-            }).ConfigureAwait(false)).Select(e => ((ElementHandleChannel)e).Object).ToList().AsReadOnly();
+            }).ConfigureAwait(false)).ToList().AsReadOnly();
 
     public async Task<JsonElement?> EvalOnSelectorAsync(string selector, string expression, object arg = null)
         => ScriptsHelper.ParseEvaluateResult<JsonElement?>(await SendMessageToServerAsync<JsonElement?>(
@@ -288,7 +280,7 @@ public async Task<T> EvalOnSelectorAllAsync<T>(string selector, string expressio
     public Task FocusAsync() => SendMessageToServerAsync("focus");
 
     public Task DispatchEventAsync(string type, object eventInit = null)
-        => SendMessageToServerAsync<ElementHandleChannel>("dispatchEvent", new Dictionary<string, object>
+        => SendMessageToServerAsync("dispatchEvent", new Dictionary<string, object>
         {
             ["type"] = type,
             ["eventInit"] = ScriptsHelper.SerializedArgument(eventInit),
@@ -313,7 +305,7 @@ public async Task<string> GetAttributeAsync(string name)
     public async Task<string> TextContentAsync() => (await SendMessageToServerAsync("textContent").ConfigureAwait(false))?.GetProperty("value").ToString();
 
     public Task SelectTextAsync(ElementHandleSelectTextOptions options = default)
-        => SendMessageToServerAsync<ElementHandleChannel>("selectText", new Dictionary<string, object>
+        => SendMessageToServerAsync("selectText", new Dictionary<string, object>
         {
             ["force"] = options?.Force,
             ["timeout"] = options?.Timeout,
@@ -360,7 +352,7 @@ private async Task<IReadOnlyList<string>> _selectOptionAsync(IEnumerable<IElemen
     }
 
     public Task CheckAsync(ElementHandleCheckOptions options = default)
-        => SendMessageToServerAsync<ElementHandleChannel>("check", new Dictionary<string, object>
+        => SendMessageToServerAsync("check", new Dictionary<string, object>
         {
             ["force"] = options?.Force,
             ["position"] = options?.Position,
@@ -370,7 +362,7 @@ public Task CheckAsync(ElementHandleCheckOptions options = default)
         });
 
     public Task UncheckAsync(ElementHandleUncheckOptions options = default)
-        => SendMessageToServerAsync<ElementHandleChannel>("uncheck", new Dictionary<string, object>
+        => SendMessageToServerAsync("uncheck", new Dictionary<string, object>
         {
             ["force"] = options?.Force,
             ["position"] = options?.Position,
@@ -409,7 +401,7 @@ public async Task<string> InputValueAsync(ElementHandleInputValueOptions options
             }).ConfigureAwait(false))?.GetProperty("value").GetString();
 
     public Task SetCheckedAsync(bool checkedState, ElementHandleSetCheckedOptions options = null)
-        => SendMessageToServerAsync<ElementHandleChannel>(checkedState ? "check" : "uncheck", new Dictionary<string, object>
+        => SendMessageToServerAsync(checkedState ? "check" : "uncheck", new Dictionary<string, object>
         {
             ["force"] = options?.Force,
             ["position"] = options?.Position,
diff --git a/src/Playwright/Core/Frame.cs b/src/Playwright/Core/Frame.cs
index bd7b4e698a..8c31df9e96 100644
--- a/src/Playwright/Core/Frame.cs
+++ b/src/Playwright/Core/Frame.cs
@@ -36,20 +36,17 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Frame : ChannelOwnerBase, IChannelOwner<Frame>, IFrame
+internal class Frame : ChannelOwnerBase, IFrame
 {
-    internal readonly FrameChannel _channel;
     private readonly List<WaitUntilState> _loadStates = new();
     internal readonly List<Frame> _childFrames = new();
 
-    internal Frame(IChannelOwner parent, string guid, FrameInitializer initializer) : base(parent, guid)
+    internal Frame(ChannelOwnerBase parent, string guid, FrameInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         Url = initializer.Url;
         Name = initializer.Name;
         ParentFrame = initializer.ParentFrame;
@@ -66,10 +63,6 @@ internal Frame(IChannelOwner parent, string guid, FrameInitializer initializer)
     /// </summary>
     public event EventHandler<WaitUntilState> LoadState;
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Frame> IChannelOwner<Frame>.Channel => _channel;
-
     public IReadOnlyList<IFrame> ChildFrames => _childFrames;
 
     public string Name { get; internal set; }
@@ -150,7 +143,7 @@ internal void OnNavigated(FrameNavigatedEventArgs e)
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IElementHandle> FrameElementAsync()
-        => (await SendMessageToServerAsync<ElementHandleChannel>("frameElement").ConfigureAwait(false)).Object;
+        => await SendMessageToServerAsync<ElementHandle>("frameElement").ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public IFrameLocator FrameLocator(string selector)
@@ -329,7 +322,7 @@ await waiter.WaitForEventAsync<WaitUntilState>(
                 }).ConfigureAwait(false);
         }
 
-        var request = navigatedEvent.NewDocument?.Request?.Object;
+        var request = navigatedEvent.NewDocument?.Request;
         var response = request != null
             ? await waiter.WaitForPromiseAsync(request.FinalRequest.ResponseAsync()).ConfigureAwait(false)
             : null;
@@ -487,13 +480,13 @@ public async Task<IElementHandle> AddScriptTagAsync(FrameAddScriptTagOptions opt
             content += "//# sourceURL=" + options.Path.Replace("\n", string.Empty);
         }
 
-        return (await SendMessageToServerAsync<ElementHandleChannel>("addScriptTag", new Dictionary<string, object>
+        return await SendMessageToServerAsync<ElementHandle>("addScriptTag", new Dictionary<string, object>
         {
             ["url"] = options?.Url,
             ["path"] = options?.Path,
             ["content"] = content,
             ["type"] = options?.Type,
-        }).ConfigureAwait(false)).Object;
+        }).ConfigureAwait(false);
     }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
@@ -506,12 +499,12 @@ public async Task<IElementHandle> AddStyleTagAsync(FrameAddStyleTagOptions optio
             content += "//# sourceURL=" + options.Path.Replace("\n", string.Empty);
         }
 
-        return (await SendMessageToServerAsync<ElementHandleChannel>("addStyleTag", new Dictionary<string, object>
+        return await SendMessageToServerAsync<ElementHandle>("addStyleTag", new Dictionary<string, object>
         {
             ["url"] = options?.Url,
             ["path"] = options?.Path,
             ["content"] = content,
-        }).ConfigureAwait(false)).Object;
+        }).ConfigureAwait(false);
     }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
@@ -642,23 +635,23 @@ public async Task<string> InputValueAsync(string selector, FrameInputValueOption
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IElementHandle> QuerySelectorAsync(string selector)
-        => (await SendMessageToServerAsync<ElementHandleChannel>("querySelector", new Dictionary<string, object>
+        => await SendMessageToServerAsync<ElementHandle>("querySelector", new Dictionary<string, object>
         {
             ["selector"] = selector,
-        }).ConfigureAwait(false))?.Object;
+        }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IReadOnlyList<IElementHandle>> QuerySelectorAllAsync(string selector)
-        => (await SendMessageToServerAsync<ChannelBase[]>(
+        => (await SendMessageToServerAsync<ElementHandle[]>(
             "querySelectorAll",
             new Dictionary<string, object>
             {
                 ["selector"] = selector,
-            }).ConfigureAwait(false)).Select(c => ((ElementHandleChannel)c).Object).ToList().AsReadOnly();
+            }).ConfigureAwait(false)).ToList().AsReadOnly();
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IJSHandle> WaitForFunctionAsync(string expression, object arg = default, FrameWaitForFunctionOptions options = default)
-         => (await SendMessageToServerAsync<JSHandleChannel>(
+         => await SendMessageToServerAsync<JSHandle>(
             "waitForFunction",
             new Dictionary<string, object>
             {
@@ -666,11 +659,11 @@ public async Task<IJSHandle> WaitForFunctionAsync(string expression, object arg
                 ["arg"] = ScriptsHelper.SerializedArgument(arg),
                 ["timeout"] = options?.Timeout,
                 ["pollingInterval"] = options?.PollingInterval,
-            }).ConfigureAwait(false)).Object;
+            }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IElementHandle> WaitForSelectorAsync(string selector, FrameWaitForSelectorOptions options = default)
-       => (await SendMessageToServerAsync<ElementHandleChannel>(
+       => await SendMessageToServerAsync<ElementHandle>(
             "waitForSelector",
             new Dictionary<string, object>
             {
@@ -679,17 +672,17 @@ public async Task<IElementHandle> WaitForSelectorAsync(string selector, FrameWai
                 ["state"] = options?.State,
                 ["strict"] = options?.Strict,
                 ["omitReturnValue"] = false,
-            }).ConfigureAwait(false))?.Object;
+            }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IJSHandle> EvaluateHandleAsync(string script, object args = null)
-        => (await SendMessageToServerAsync<JSHandleChannel>(
+        => await SendMessageToServerAsync<JSHandle>(
             "evaluateExpressionHandle",
             new Dictionary<string, object>
             {
                 ["expression"] = script,
                 ["arg"] = ScriptsHelper.SerializedArgument(args),
-            }).ConfigureAwait(false))?.Object;
+            }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<JsonElement?> EvaluateAsync(string script, object arg = null)
@@ -786,23 +779,23 @@ public ILocator Locator(string selector, FrameLocatorOptions options = null) =>
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IElementHandle> QuerySelectorAsync(string selector, FrameQuerySelectorOptions options = null)
-        => (await SendMessageToServerAsync<ElementHandleChannel>(
+        => await SendMessageToServerAsync<ElementHandle>(
             "querySelector",
             new Dictionary<string, object>
             {
                 ["selector"] = selector,
                 ["strict"] = options?.Strict,
-            }).ConfigureAwait(false))?.Object;
+            }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IResponse> GotoAsync(string url, FrameGotoOptions options = default)
-        => (await SendMessageToServerAsync<ResponseChannel>("goto", new Dictionary<string, object>
+        => await SendMessageToServerAsync<Response>("goto", new Dictionary<string, object>
         {
             ["url"] = url,
             ["timeout"] = options?.Timeout,
             ["waitUntil"] = options?.WaitUntil,
             ["referer"] = options?.Referer,
-        }).ConfigureAwait(false))?.Object;
+        }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<bool> IsCheckedAsync(string selector, FrameIsCheckedOptions options = default)
diff --git a/src/Playwright/Core/FrameNavigatedEventArgs.cs b/src/Playwright/Core/FrameNavigatedEventArgs.cs
index eadc19ffa8..1220a917c1 100644
--- a/src/Playwright/Core/FrameNavigatedEventArgs.cs
+++ b/src/Playwright/Core/FrameNavigatedEventArgs.cs
@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-using Microsoft.Playwright.Transport.Channels;
-
 namespace Microsoft.Playwright.Core;
 
 internal class FrameNavigatedEventArgs
@@ -39,5 +37,5 @@ internal class FrameNavigatedEventArgs
 
 internal class NavigateDocument
 {
-    public RequestChannel Request { get; set; }
+    public Request Request { get; set; }
 }
diff --git a/src/Playwright/Core/JSHandle.cs b/src/Playwright/Core/JSHandle.cs
index ddbca1a245..a45da03666 100644
--- a/src/Playwright/Core/JSHandle.cs
+++ b/src/Playwright/Core/JSHandle.cs
@@ -28,25 +28,17 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class JSHandle : ChannelOwnerBase, IChannelOwner<JSHandle>, IJSHandle
+internal class JSHandle : ChannelOwnerBase, IJSHandle
 {
-    private readonly JSHandleChannel _channel;
-
-    internal JSHandle(IChannelOwner parent, string guid, JSHandleInitializer initializer) : base(parent, guid)
+    internal JSHandle(ChannelOwnerBase parent, string guid, JSHandleInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         Preview = initializer.Preview;
     }
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<JSHandle> IChannelOwner<JSHandle>.Channel => _channel;
-
     internal string Preview { get; set; }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
@@ -64,13 +56,13 @@ internal JSHandle(IChannelOwner parent, string guid, JSHandleInitializer initial
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IJSHandle> EvaluateHandleAsync(string expression, object arg = null)
-        => (await SendMessageToServerAsync<JSHandleChannel>(
+        => await SendMessageToServerAsync<JSHandle>(
             "evaluateExpressionHandle",
             new Dictionary<string, object>
             {
                 ["expression"] = expression,
                 ["arg"] = ScriptsHelper.SerializedArgument(arg),
-            }).ConfigureAwait(false))?.Object;
+            }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<T> EvaluateAsync<T>(string expression, object arg = null)
@@ -86,12 +78,12 @@ public async Task<T> EvaluateAsync<T>(string expression, object arg = null)
     public async Task<T> JsonValueAsync<T>() => ScriptsHelper.ParseEvaluateResult<T>(await SendMessageToServerAsync<JsonElement>("jsonValue").ConfigureAwait(false));
 
     [MethodImpl(MethodImplOptions.NoInlining)]
-    public async Task<IJSHandle> GetPropertyAsync(string propertyName) => (await SendMessageToServerAsync<JSHandleChannel>(
+    public async Task<IJSHandle> GetPropertyAsync(string propertyName) => await SendMessageToServerAsync<JSHandle>(
             "getProperty",
             new Dictionary<string, object>
             {
                 ["name"] = propertyName,
-            }).ConfigureAwait(false))?.Object;
+            }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<Dictionary<string, IJSHandle>> GetPropertiesAsync()
@@ -102,7 +94,7 @@ public async Task<Dictionary<string, IJSHandle>> GetPropertiesAsync()
 
         foreach (var kv in channelResult)
         {
-            result[kv.Name] = kv.Value.Object;
+            result[kv.Name] = kv.Value;
         }
 
         return result;
@@ -118,5 +110,5 @@ internal class JSElementProperty
 {
     public string Name { get; set; }
 
-    public JSHandleChannel Value { get; set; }
+    public JSHandle Value { get; set; }
 }
diff --git a/src/Playwright/Core/JsonPipe.cs b/src/Playwright/Core/JsonPipe.cs
index 0ae32d71e9..baef0ab65c 100644
--- a/src/Playwright/Core/JsonPipe.cs
+++ b/src/Playwright/Core/JsonPipe.cs
@@ -29,19 +29,16 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class JsonPipe : ChannelOwnerBase, IChannelOwner<JsonPipe>
+internal class JsonPipe : ChannelOwnerBase
 {
-    private readonly JsonPipeChannel _channel;
     private readonly JsonPipeInitializer _initializer;
 
-    public JsonPipe(IChannelOwner parent, string guid, JsonPipeInitializer initializer) : base(parent, guid)
+    public JsonPipe(ChannelOwnerBase parent, string guid, JsonPipeInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         _initializer = initializer;
     }
 
@@ -49,10 +46,6 @@ public JsonPipe(IChannelOwner parent, string guid, JsonPipeInitializer initializ
 
     public event EventHandler<SerializedError> Closed;
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<JsonPipe> IChannelOwner<JsonPipe>.Channel => _channel;
-
     internal override void OnMessage(string method, JsonElement? serverParams)
     {
         switch (method)
diff --git a/src/Playwright/Core/Keyboard.cs b/src/Playwright/Core/Keyboard.cs
index ddbb027f5d..2876d4e3d8 100644
--- a/src/Playwright/Core/Keyboard.cs
+++ b/src/Playwright/Core/Keyboard.cs
@@ -24,21 +24,20 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Core;
 
 internal class Keyboard : IKeyboard
 {
-    private readonly PageChannel _channel;
+    private readonly Page _page;
 
-    public Keyboard(PageChannel channel)
+    public Keyboard(Page page)
     {
-        _channel = channel;
+        _page = page;
     }
 
     public Task DownAsync(string key)
-          => _channel.Object.SendMessageToServerAsync(
+          => _page.SendMessageToServerAsync(
             "keyboardDown",
             new Dictionary<string, object>
             {
@@ -46,7 +45,7 @@ public Task DownAsync(string key)
             });
 
     public Task UpAsync(string key)
-            => _channel.Object.SendMessageToServerAsync(
+            => _page.SendMessageToServerAsync(
             "keyboardUp",
             new Dictionary<string, object>
             {
@@ -54,7 +53,7 @@ public Task UpAsync(string key)
             });
 
     public Task PressAsync(string key, KeyboardPressOptions options = default)
-       => _channel.Object.SendMessageToServerAsync(
+       => _page.SendMessageToServerAsync(
             "keyboardPress",
             new Dictionary<string, object>
             {
@@ -63,7 +62,7 @@ public Task PressAsync(string key, KeyboardPressOptions options = default)
             });
 
     public Task TypeAsync(string text, KeyboardTypeOptions options = default)
-        => _channel.Object.SendMessageToServerAsync(
+        => _page.SendMessageToServerAsync(
             "keyboardType",
             new Dictionary<string, object>
             {
@@ -72,7 +71,7 @@ public Task TypeAsync(string text, KeyboardTypeOptions options = default)
             });
 
     public Task InsertTextAsync(string text)
-        => _channel.Object.SendMessageToServerAsync(
+        => _page.SendMessageToServerAsync(
             "keyboardInsertText",
             new Dictionary<string, object>
             {
diff --git a/src/Playwright/Core/LocalUtils.cs b/src/Playwright/Core/LocalUtils.cs
index b9062f5b8e..fb777c6b77 100644
--- a/src/Playwright/Core/LocalUtils.cs
+++ b/src/Playwright/Core/LocalUtils.cs
@@ -27,29 +27,22 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class LocalUtils : ChannelOwnerBase, IChannelOwner<LocalUtils>
+internal class LocalUtils : ChannelOwnerBase
 {
-    private readonly LocalUtilsChannel _channel;
     internal readonly Dictionary<string, BrowserNewContextOptions> _devices = new();
 
-    public LocalUtils(IChannelOwner parent, string guid, LocalUtilsInitializer initializer) : base(parent, guid)
+    public LocalUtils(ChannelOwnerBase parent, string guid, LocalUtilsInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         foreach (var entry in initializer.DeviceDescriptors)
         {
             _devices[entry.Name] = entry.Descriptor;
         }
     }
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<LocalUtils> IChannelOwner<LocalUtils>.Channel => _channel;
-
     internal Task ZipAsync(string zipFile, List<NameValue> entries, string mode, string stacksId, bool includeSources)
         => SendMessageToServerAsync("zip", new Dictionary<string, object>
         {
diff --git a/src/Playwright/Core/Locator.cs b/src/Playwright/Core/Locator.cs
index 3449ece2cf..2b2ff5504d 100644
--- a/src/Playwright/Core/Locator.cs
+++ b/src/Playwright/Core/Locator.cs
@@ -32,7 +32,6 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
@@ -393,14 +392,13 @@ private Task<TResult> WithElementAsync<TResult>(Func<IElementHandle, float?, Tas
 
         return this._frame.WrapApiCallAsync(async () =>
         {
-            var result = await _frame.SendMessageToServerAsync<ElementHandleChannel>("waitForSelector", new Dictionary<string, object>
+            var handle = await _frame.SendMessageToServerAsync<ElementHandle>("waitForSelector", new Dictionary<string, object>
             {
                 ["selector"] = this._selector,
                 ["state"] = WaitForSelectorState.Attached,
                 ["timeout"] = timeout,
                 ["strict"] = true,
             }).ConfigureAwait(false);
-            var handle = result?.Object;
             if (handle == null)
             {
                 throw new PlaywrightException($"Could not resolve {this._selector} to DOM Element");
diff --git a/src/Playwright/Core/Mouse.cs b/src/Playwright/Core/Mouse.cs
index 5ce2a1a20a..42d4aef2cb 100644
--- a/src/Playwright/Core/Mouse.cs
+++ b/src/Playwright/Core/Mouse.cs
@@ -24,21 +24,20 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Core;
 
 internal class Mouse : IMouse
 {
-    private readonly PageChannel _channel;
+    private readonly Page _page;
 
-    public Mouse(PageChannel channel)
+    public Mouse(Page page)
     {
-        _channel = channel;
+        _page = page;
     }
 
     public Task ClickAsync(float x, float y, MouseClickOptions options = default)
-        => _channel.Object.SendMessageToServerAsync(
+        => _page.SendMessageToServerAsync(
             "mouseClick",
             new Dictionary<string, object>
             {
@@ -50,7 +49,7 @@ public Task ClickAsync(float x, float y, MouseClickOptions options = default)
             });
 
     public Task DblClickAsync(float x, float y, MouseDblClickOptions options = default)
-        => _channel.Object.SendMessageToServerAsync(
+        => _page.SendMessageToServerAsync(
             "mouseClick",
             new Dictionary<string, object>
             {
@@ -62,7 +61,7 @@ public Task DblClickAsync(float x, float y, MouseDblClickOptions options = defau
             });
 
     public Task DownAsync(MouseDownOptions options = default)
-        => _channel.Object.SendMessageToServerAsync(
+        => _page.SendMessageToServerAsync(
             "mouseDown",
             new Dictionary<string, object>
             {
@@ -71,7 +70,7 @@ public Task DownAsync(MouseDownOptions options = default)
             });
 
     public Task MoveAsync(float x, float y, MouseMoveOptions options = default)
-        => _channel.Object.SendMessageToServerAsync(
+        => _page.SendMessageToServerAsync(
             "mouseMove",
             new Dictionary<string, object>
             {
@@ -81,7 +80,7 @@ public Task MoveAsync(float x, float y, MouseMoveOptions options = default)
             });
 
     public Task UpAsync(MouseUpOptions options = default)
-      => _channel.Object.SendMessageToServerAsync(
+      => _page.SendMessageToServerAsync(
             "mouseUp",
             new Dictionary<string, object>
             {
@@ -90,7 +89,7 @@ public Task UpAsync(MouseUpOptions options = default)
             });
 
     public Task WheelAsync(float deltaX, float deltaY)
-        => _channel.Object.SendMessageToServerAsync(
+        => _page.SendMessageToServerAsync(
             "mouseWheel",
             new Dictionary<string, object>
             {
diff --git a/src/Playwright/Core/Page.cs b/src/Playwright/Core/Page.cs
index 24af6dac04..8dac82ea9a 100644
--- a/src/Playwright/Core/Page.cs
+++ b/src/Playwright/Core/Page.cs
@@ -34,14 +34,12 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Page : ChannelOwnerBase, IChannelOwner<Page>, IPage
+internal class Page : ChannelOwnerBase, IPage
 {
-    private readonly PageChannel _channel;
     private readonly List<Frame> _frames = new();
     private readonly IAccessibility _accessibility;
     private readonly IMouse _mouse;
@@ -55,13 +53,11 @@ internal class Page : ChannelOwnerBase, IChannelOwner<Page>, IPage
     private Video _video;
     private string _closeReason;
 
-    internal Page(IChannelOwner parent, string guid, PageInitializer initializer) : base(parent, guid)
+    internal Page(ChannelOwnerBase parent, string guid, PageInitializer initializer) : base(parent, guid)
     {
         Context = (BrowserContext)parent;
         _timeoutSettings = new(Context._timeoutSettings);
 
-        _channel = new(guid, parent.Connection, this);
-
         MainFrame = initializer.MainFrame;
         MainFrame.Page = this;
         _frames.Add(MainFrame);
@@ -71,10 +67,10 @@ internal Page(IChannelOwner parent, string guid, PageInitializer initializer) :
         }
 
         IsClosed = initializer.IsClosed;
-        _accessibility = new Accessibility(_channel);
-        _keyboard = new Keyboard(_channel);
-        _touchscreen = new Touchscreen(_channel);
-        _mouse = new Mouse(_channel);
+        _accessibility = new Accessibility(this);
+        _keyboard = new Keyboard(this);
+        _touchscreen = new Touchscreen(this);
+        _mouse = new Mouse(this);
         APIRequest = Context._request;
 
         _initializer = initializer;
@@ -163,10 +159,6 @@ public event EventHandler<IFileChooser> FileChooser
 
     public event EventHandler<IDownload> Download;
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Page> IChannelOwner<Page>.Channel => _channel;
-
     public bool IsClosed { get; private set; }
 
     IFrame IPage.MainFrame => MainFrame;
@@ -227,8 +219,6 @@ public IVideo Video
 
     internal Page Opener => _initializer.Opener;
 
-    internal PageChannel Channel => _channel;
-
     internal TaskCompletionSource<bool> ClosedOrCrashedTcs { get; } = new();
 
     public IAPIRequestContext APIRequest { get; }
@@ -246,35 +236,35 @@ internal override void OnMessage(string method, JsonElement? serverParams)
             case "bindingCall":
                 Channel_BindingCall(
                     this,
-                    serverParams?.GetProperty("binding").ToObject<BindingCallChannel>(_connection.DefaultJsonSerializerOptions).Object);
+                    serverParams?.GetProperty("binding").ToObject<BindingCall>(_connection.DefaultJsonSerializerOptions));
                 break;
             case "route":
-                var route = serverParams?.GetProperty("route").ToObject<RouteChannel>(_connection.DefaultJsonSerializerOptions).Object;
+                var route = serverParams?.GetProperty("route").ToObject<Route>(_connection.DefaultJsonSerializerOptions);
                 Channel_Route(this, route);
                 break;
             case "popup":
-                Popup?.Invoke(this, serverParams?.GetProperty("page").ToObject<PageChannel>(_connection.DefaultJsonSerializerOptions).Object);
+                Popup?.Invoke(this, serverParams?.GetProperty("page").ToObject<Page>(_connection.DefaultJsonSerializerOptions));
                 break;
             case "fileChooser":
-                _fileChooserImpl?.Invoke(this, new FileChooser(this, serverParams.Value.GetProperty("element").ToObject<ElementHandleChannel>(_connection.DefaultJsonSerializerOptions).Object, serverParams.Value.GetProperty("isMultiple").ToObject<bool>(_connection.DefaultJsonSerializerOptions)));
+                _fileChooserImpl?.Invoke(this, new FileChooser(this, serverParams.Value.GetProperty("element").ToObject<ElementHandle>(_connection.DefaultJsonSerializerOptions), serverParams.Value.GetProperty("isMultiple").ToObject<bool>(_connection.DefaultJsonSerializerOptions)));
                 break;
             case "frameAttached":
-                Channel_FrameAttached(this, serverParams?.GetProperty("frame").ToObject<FrameChannel>(_connection.DefaultJsonSerializerOptions).Object);
+                Channel_FrameAttached(this, serverParams?.GetProperty("frame").ToObject<Frame>(_connection.DefaultJsonSerializerOptions));
                 break;
             case "frameDetached":
-                Channel_FrameDetached(this, serverParams?.GetProperty("frame").ToObject<FrameChannel>(_connection.DefaultJsonSerializerOptions).Object);
+                Channel_FrameDetached(this, serverParams?.GetProperty("frame").ToObject<Frame>(_connection.DefaultJsonSerializerOptions));
                 break;
             case "webSocket":
-                WebSocket?.Invoke(this, serverParams?.GetProperty("webSocket").ToObject<WebSocketChannel>(_connection.DefaultJsonSerializerOptions).Object);
+                WebSocket?.Invoke(this, serverParams?.GetProperty("webSocket").ToObject<WebSocket>(_connection.DefaultJsonSerializerOptions));
                 break;
             case "download":
-                Download?.Invoke(this, new Download(this, serverParams.Value.GetProperty("url").ToObject<string>(_connection.DefaultJsonSerializerOptions), serverParams.Value.GetProperty("suggestedFilename").ToObject<string>(_connection.DefaultJsonSerializerOptions), serverParams.Value.GetProperty("artifact").ToObject<ArtifactChannel>(_connection.DefaultJsonSerializerOptions).Object));
+                Download?.Invoke(this, new Download(this, serverParams.Value.GetProperty("url").ToObject<string>(_connection.DefaultJsonSerializerOptions), serverParams.Value.GetProperty("suggestedFilename").ToObject<string>(_connection.DefaultJsonSerializerOptions), serverParams.Value.GetProperty("artifact").ToObject<Artifact>(_connection.DefaultJsonSerializerOptions)));
                 break;
             case "video":
-                ForceVideo().ArtifactReady(serverParams?.GetProperty("artifact").ToObject<ArtifactChannel>(_connection.DefaultJsonSerializerOptions).Object);
+                ForceVideo().ArtifactReady(serverParams?.GetProperty("artifact").ToObject<Artifact>(_connection.DefaultJsonSerializerOptions));
                 break;
             case "worker":
-                var worker = serverParams?.GetProperty("worker").ToObject<WorkerChannel>(_connection.DefaultJsonSerializerOptions).Object;
+                var worker = serverParams?.GetProperty("worker").ToObject<Worker>(_connection.DefaultJsonSerializerOptions);
                 _workers.Add(worker);
                 worker.Page = this;
                 Worker?.Invoke(this, worker);
@@ -701,7 +691,7 @@ public async Task<byte[]> ScreenshotAsync(PageScreenshotOptions options = defaul
             ["maskColor"] = options.MaskColor,
             ["mask"] = options.Mask?.Select(locator => new Dictionary<string, object>
             {
-                ["frame"] = ((Locator)locator)._frame._channel,
+                ["frame"] = ((Locator)locator)._frame,
                 ["selector"] = ((Locator)locator)._selector,
             }).ToArray(),
         }).ConfigureAwait(false))?.GetProperty("binary").GetBytesFromBase64();
@@ -795,27 +785,27 @@ public Task DblClickAsync(string selector, PageDblClickOptions options = default
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IResponse> GoBackAsync(PageGoBackOptions options = default)
-        => (await SendMessageToServerAsync<ResponseChannel>("goBack", new Dictionary<string, object>
+        => await SendMessageToServerAsync<Response>("goBack", new Dictionary<string, object>
         {
             ["timeout"] = options?.Timeout,
             ["waitUntil"] = options?.WaitUntil,
-        }).ConfigureAwait(false))?.Object;
+        }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IResponse> GoForwardAsync(PageGoForwardOptions options = default)
-        => (await SendMessageToServerAsync<ResponseChannel>("goForward", new Dictionary<string, object>
+        => await SendMessageToServerAsync<Response>("goForward", new Dictionary<string, object>
         {
             ["timeout"] = options?.Timeout,
             ["waitUntil"] = options?.WaitUntil,
-        }).ConfigureAwait(false))?.Object;
+        }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<IResponse> ReloadAsync(PageReloadOptions options = default)
-        => (await SendMessageToServerAsync<ResponseChannel>("reload", new Dictionary<string, object>
+        => await SendMessageToServerAsync<Response>("reload", new Dictionary<string, object>
         {
             ["timeout"] = options?.Timeout,
             ["waitUntil"] = options?.WaitUntil,
-        }).ConfigureAwait(false))?.Object;
+        }).ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public Task ExposeBindingAsync(string name, Action callback, PageExposeBindingOptions options = default)
@@ -916,7 +906,7 @@ public async Task<byte[]> PdfAsync(PagePdfOptions options = default)
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public Task AddInitScriptAsync(string script, string scriptPath)
-        => SendMessageToServerAsync<PageChannel>(
+        => SendMessageToServerAsync(
             "addInitScript",
             new Dictionary<string, object>
             {
@@ -1343,7 +1333,7 @@ private Task InnerExposeBindingAsync(string name, Delegate callback, bool handle
 
         Bindings.Add(name, callback);
 
-        return SendMessageToServerAsync<PageChannel>(
+        return SendMessageToServerAsync(
             "exposeBinding",
             new Dictionary<string, object>
             {
@@ -1352,7 +1342,7 @@ private Task InnerExposeBindingAsync(string name, Delegate callback, bool handle
             });
     }
 
-    private Video ForceVideo() => _video ??= new(this, _channel.Connection);
+    private Video ForceVideo() => _video ??= new(this, _connection);
 
     private FrameSetInputFilesOptions Map(PageSetInputFilesOptions options)
     {
@@ -1383,7 +1373,7 @@ public async Task RouteFromHARAsync(string har, PageRouteFromHAROptions options
             }).ConfigureAwait(false);
             return;
         }
-        var harRouter = await HarRouter.CreateAsync(Channel.Connection.LocalUtils, har, options?.NotFound ?? HarNotFound.Abort, new()
+        var harRouter = await HarRouter.CreateAsync(_connection.LocalUtils, har, options?.NotFound ?? HarNotFound.Abort, new()
         {
             UrlRegex = options?.UrlRegex,
             Url = options?.Url,
diff --git a/src/Playwright/Core/PlaywrightImpl.cs b/src/Playwright/Core/PlaywrightImpl.cs
index 6e6cde6ef4..549c7ecec6 100644
--- a/src/Playwright/Core/PlaywrightImpl.cs
+++ b/src/Playwright/Core/PlaywrightImpl.cs
@@ -26,25 +26,22 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
 [SuppressMessage("Microsoft.Design", "CA1724", Justification = "Playwright is the entrypoint for all languages.")]
-internal class PlaywrightImpl : ChannelOwnerBase, IPlaywright, IChannelOwner<PlaywrightImpl>
+internal class PlaywrightImpl : ChannelOwnerBase, IPlaywright
 {
     private readonly PlaywrightInitializer _initializer;
-    internal readonly PlaywrightChannel _channel;
     internal SelectorsAPI _selectors;
 
     private readonly Dictionary<string, BrowserNewContextOptions> _devices = new(StringComparer.InvariantCultureIgnoreCase);
 
-    internal PlaywrightImpl(IChannelOwner parent, string guid, PlaywrightInitializer initializer)
+    internal PlaywrightImpl(ChannelOwnerBase parent, string guid, PlaywrightInitializer initializer)
          : base(parent, guid)
     {
         _initializer = initializer;
-        _channel = new(guid, parent.Connection, this);
 
         _devices = _connection.LocalUtils?._devices ?? new();
 
@@ -61,12 +58,6 @@ internal PlaywrightImpl(IChannelOwner parent, string guid, PlaywrightInitializer
 
     ~PlaywrightImpl() => Dispose(false);
 
-    Connection IChannelOwner.Connection => _connection;
-
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<PlaywrightImpl> IChannelOwner<PlaywrightImpl>.Channel => _channel;
-
     public IBrowserType Chromium { get => _initializer.Chromium; set => throw new NotSupportedException(); }
 
     public IBrowserType Firefox { get => _initializer.Firefox; set => throw new NotSupportedException(); }
diff --git a/src/Playwright/Core/Request.cs b/src/Playwright/Core/Request.cs
index 4aa522f049..fd9470a0c0 100644
--- a/src/Playwright/Core/Request.cs
+++ b/src/Playwright/Core/Request.cs
@@ -31,22 +31,20 @@
 using System.Web;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
+
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Request : ChannelOwnerBase, IChannelOwner<Request>, IRequest
+internal class Request : ChannelOwnerBase, IRequest
 {
-    private readonly RequestChannel _channel;
     internal readonly RequestInitializer _initializer;
     private readonly RawHeaders _provisionalHeaders;
     private readonly RouteFallbackOptions _fallbackOverrides = new();
     private Task<RawHeaders> _rawHeadersTask;
 
-    internal Request(IChannelOwner parent, string guid, RequestInitializer initializer) : base(parent, guid)
+    internal Request(ChannelOwnerBase parent, string guid, RequestInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         _initializer = initializer;
         RedirectedFrom = _initializer.RedirectedFrom;
         Timing = new();
@@ -60,10 +58,6 @@ internal Request(IChannelOwner parent, string guid, RequestInitializer initializ
         _fallbackOverrides.PostData = initializer.PostData;
     }
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Request> IChannelOwner<Request>.Channel => _channel;
-
     public string Failure { get; internal set; }
 
     public IFrame Frame
@@ -144,7 +138,7 @@ public byte[] PostDataBuffer
     internal BrowserContext _context => (BrowserContext)Frame.Page.Context;
 
     [MethodImpl(MethodImplOptions.NoInlining)]
-    public async Task<IResponse> ResponseAsync() => (await SendMessageToServerAsync<ResponseChannel>("response").ConfigureAwait(false))?.Object;
+    public async Task<IResponse> ResponseAsync() => await SendMessageToServerAsync<Response>("response").ConfigureAwait(false);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public JsonElement? PostDataJSON()
@@ -180,12 +174,12 @@ public byte[] PostDataBuffer
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<RequestSizesResult> SizesAsync()
     {
-        if (await ResponseAsync().ConfigureAwait(false) is not IChannelOwner<Response> res)
+        if (await ResponseAsync().ConfigureAwait(false) is not Response res)
         {
             throw new PlaywrightException("Unable to fetch resources sizes.");
         }
 
-        return (await ((Response)res).SendMessageToServerAsync("sizes").ConfigureAwait(false))?.GetProperty("sizes").ToObject<RequestSizesResult>();
+        return (await res.SendMessageToServerAsync("sizes").ConfigureAwait(false))?.GetProperty("sizes").ToObject<RequestSizesResult>();
     }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
diff --git a/src/Playwright/Core/Response.cs b/src/Playwright/Core/Response.cs
index 3ffa75e499..da7bd7e153 100644
--- a/src/Playwright/Core/Response.cs
+++ b/src/Playwright/Core/Response.cs
@@ -30,22 +30,19 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Response : ChannelOwnerBase, IChannelOwner<Response>, IResponse
+internal class Response : ChannelOwnerBase, IResponse
 {
-    private readonly ResponseChannel _channel;
     private readonly ResponseInitializer _initializer;
     private readonly TaskCompletionSource<string> _finishedTask;
     private readonly RawHeaders _headers;
     private Task<RawHeaders> _rawHeadersTask;
 
-    internal Response(IChannelOwner parent, string guid, ResponseInitializer initializer) : base(parent, guid)
+    internal Response(ChannelOwnerBase parent, string guid, ResponseInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         _initializer = initializer;
         _initializer.Request.Timing = _initializer.Timing;
         _finishedTask = new();
@@ -69,10 +66,6 @@ internal Response(IChannelOwner parent, string guid, ResponseInitializer initial
 
     public bool FromServiceWorker => _initializer.FromServiceWorker;
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Response> IChannelOwner<Response>.Channel => _channel;
-
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<Dictionary<string, string>> AllHeadersAsync()
         => (await GetRawHeadersAsync().ConfigureAwait(false)).Headers;
diff --git a/src/Playwright/Core/Route.cs b/src/Playwright/Core/Route.cs
index 4811bbf029..b04178a424 100644
--- a/src/Playwright/Core/Route.cs
+++ b/src/Playwright/Core/Route.cs
@@ -32,7 +32,6 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
@@ -40,16 +39,14 @@ namespace Microsoft.Playwright.Core;
 /// <summary>
 /// <see cref="IRoute"/>.
 /// </summary>
-internal class Route : ChannelOwnerBase, IChannelOwner<Route>, IRoute
+internal class Route : ChannelOwnerBase, IRoute
 {
-    private readonly RouteChannel _channel;
     private readonly RouteInitializer _initializer;
     private readonly Request _request;
     private TaskCompletionSource<bool> _handlingTask;
 
-    internal Route(IChannelOwner parent, string guid, RouteInitializer initializer) : base(parent, guid)
+    internal Route(ChannelOwnerBase parent, string guid, RouteInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         _initializer = initializer;
         _request = initializer.Request;
     }
@@ -58,10 +55,6 @@ internal Route(IChannelOwner parent, string guid, RouteInitializer initializer)
 
     internal BrowserContext _context { get; set; }
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Route> IChannelOwner<Route>.Channel => _channel;
-
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task FulfillAsync(RouteFulfillOptions options = default)
     {
@@ -107,7 +100,7 @@ public async Task ContinueAsync(RouteContinueOptions options = default)
     internal async Task InnerContinueAsync(bool @internal = false)
     {
         var options = _request.FallbackOverridesForContinue();
-        await _channel.Connection.WrapApiCallAsync(
+        await _connection.WrapApiCallAsync(
             () => RaceWithTargetCloseAsync(
                 SendMessageToServerAsync(
             "continue",
@@ -167,7 +160,7 @@ private async Task<Dictionary<string, object>> NormalizeFulfillParametersAsync(
             headers ??= response.Headers;
             if (body == null && path == null && response is APIResponse responseImpl)
             {
-                if (responseImpl._context._channel.Connection == this._channel.Connection)
+                if (responseImpl._context._connection == this._connection)
                 {
                     fetchResponseUid = responseImpl.FetchUid();
                 }
@@ -284,7 +277,7 @@ private void ReportHandled(bool handled)
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public Task<IAPIResponse> FetchAsync(RouteFetchOptions options)
-        => _channel.Connection.WrapApiCallAsync(
+        => _connection.WrapApiCallAsync(
             () =>
             {
                 var apiRequest = (APIRequestContext)_context.APIRequest;
diff --git a/src/Playwright/Core/Selectors.cs b/src/Playwright/Core/Selectors.cs
index 35d690feb2..c860c97eff 100644
--- a/src/Playwright/Core/Selectors.cs
+++ b/src/Playwright/Core/Selectors.cs
@@ -26,22 +26,14 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Selectors : ChannelOwnerBase, IChannelOwner<Selectors>
+internal class Selectors : ChannelOwnerBase
 {
-    internal readonly SelectorsChannel _channel;
-
-    internal Selectors(IChannelOwner parent, string guid) : base(parent, guid)
+    internal Selectors(ChannelOwnerBase parent, string guid) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
     }
-
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Selectors> IChannelOwner<Selectors>.Channel => _channel;
 }
 
 internal class SelectorsAPI : ISelectors
diff --git a/src/Playwright/Core/SocksSupport.cs b/src/Playwright/Core/SocksSupport.cs
index ed7d2f027e..24a933864a 100644
--- a/src/Playwright/Core/SocksSupport.cs
+++ b/src/Playwright/Core/SocksSupport.cs
@@ -23,18 +23,12 @@
  */
 
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Core;
 
-internal class SocksSupport : ChannelOwnerBase, IChannelOwner<SocksSupport>
+internal class SocksSupport : ChannelOwnerBase
 {
-    private readonly Channel<SocksSupport> _channel;
-
-    internal SocksSupport(IChannelOwner parent, string guid) : base(parent, guid)
+    internal SocksSupport(ChannelOwnerBase parent, string guid) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
     }
-
-    IChannel<SocksSupport> IChannelOwner<SocksSupport>.Channel => _channel;
 }
diff --git a/src/Playwright/Core/Stream.cs b/src/Playwright/Core/Stream.cs
index 72daf84a08..031ec7cf58 100644
--- a/src/Playwright/Core/Stream.cs
+++ b/src/Playwright/Core/Stream.cs
@@ -29,23 +29,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Stream : ChannelOwnerBase, IChannelOwner<Stream>, IAsyncDisposable
+internal class Stream : ChannelOwnerBase, IAsyncDisposable
 {
-    internal Stream(IChannelOwner parent, string guid) : base(parent, guid)
+    internal Stream(ChannelOwnerBase parent, string guid) : base(parent, guid)
     {
-        Channel = new(guid, parent.Connection, this);
     }
 
-    ChannelBase IChannelOwner.Channel => Channel;
-
-    IChannel<Stream> IChannelOwner<Stream>.Channel => Channel;
-
-    public StreamChannel Channel { get; }
-
     public StreamImpl StreamImpl => new(this);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
diff --git a/src/Playwright/Core/Touchscreen.cs b/src/Playwright/Core/Touchscreen.cs
index 8708185ce8..0bf9074b2f 100644
--- a/src/Playwright/Core/Touchscreen.cs
+++ b/src/Playwright/Core/Touchscreen.cs
@@ -23,21 +23,20 @@
  */
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Core;
 
 internal class Touchscreen : ITouchscreen
 {
-    private readonly PageChannel _channel;
+    private readonly Page _page;
 
-    public Touchscreen(PageChannel channel)
+    public Touchscreen(Page page)
     {
-        _channel = channel;
+        _page = page;
     }
 
     public Task TapAsync(float x, float y)
-           => _channel.Object.SendMessageToServerAsync(
+           => _page.SendMessageToServerAsync(
             "touchscreenTap",
             new Dictionary<string, object>
             {
diff --git a/src/Playwright/Core/Tracing.cs b/src/Playwright/Core/Tracing.cs
index b6b11c1061..516818e5f6 100644
--- a/src/Playwright/Core/Tracing.cs
+++ b/src/Playwright/Core/Tracing.cs
@@ -28,34 +28,27 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Tracing : ChannelOwnerBase, IChannelOwner<Tracing>, ITracing
+internal class Tracing : ChannelOwnerBase, ITracing
 {
     internal string _tracesDir;
-    private readonly TracingChannel _channel;
     private bool _includeSources;
     private string _stacksId;
     private bool _isTracing;
 
-    public Tracing(IChannelOwner parent, string guid) : base(parent, guid)
+    public Tracing(ChannelOwnerBase parent, string guid) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
     }
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Tracing> IChannelOwner<Tracing>.Channel => _channel;
-
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task StartAsync(
         TracingStartOptions options = default)
     {
         _includeSources = options?.Sources == true;
-        var traceName = await _channel.Connection.WrapApiCallAsync(
+        var traceName = await _connection.WrapApiCallAsync(
             async () =>
         {
             await SendMessageToServerAsync(
@@ -94,18 +87,18 @@ private async Task StartCollectingStacksAsync(string traceName)
         if (!_isTracing)
         {
             _isTracing = true;
-            _channel.Connection.SetIsTracing(true);
+            _connection.SetIsTracing(true);
         }
-        _stacksId = await _channel.Connection.LocalUtils.TracingStartedAsync(tracesDir: _tracesDir, traceName: traceName).ConfigureAwait(false);
+        _stacksId = await _connection.LocalUtils.TracingStartedAsync(tracesDir: _tracesDir, traceName: traceName).ConfigureAwait(false);
     }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
-    public Task StopChunkAsync(TracingStopChunkOptions options = default) => _channel.Connection.WrapApiCallAsync(() => DoStopChunkAsync(filePath: options?.Path), true);
+    public Task StopChunkAsync(TracingStopChunkOptions options = default) => _connection.WrapApiCallAsync(() => DoStopChunkAsync(filePath: options?.Path), true);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task StopAsync(TracingStopOptions options = default)
     {
-        await _channel.Connection.WrapApiCallAsync(
+        await _connection.WrapApiCallAsync(
             async () =>
             {
                 await StopChunkAsync(new() { Path = options?.Path }).ConfigureAwait(false);
@@ -119,7 +112,7 @@ private async Task DoStopChunkAsync(string filePath)
         if (_isTracing)
         {
             _isTracing = false;
-            _channel.Connection.SetIsTracing(false);
+            _connection.SetIsTracing(false);
         }
 
         if (string.IsNullOrEmpty(filePath))
@@ -128,17 +121,17 @@ private async Task DoStopChunkAsync(string filePath)
             await _TracingStopChunkAsync("discard").ConfigureAwait(false);
             if (!string.IsNullOrEmpty(_stacksId))
             {
-                await _channel.Connection.LocalUtils.TraceDiscardedAsync(stacksId: _stacksId).ConfigureAwait(false);
+                await _connection.LocalUtils.TraceDiscardedAsync(stacksId: _stacksId).ConfigureAwait(false);
             }
             return;
         }
 
-        bool isLocal = !_channel.Connection.IsRemote;
+        bool isLocal = !_connection.IsRemote;
 
         if (isLocal)
         {
             var (_, sourceEntries) = await _TracingStopChunkAsync("entries").ConfigureAwait(false);
-            await _channel.Connection.LocalUtils.ZipAsync(filePath, sourceEntries, "write", _stacksId, _includeSources).ConfigureAwait(false);
+            await _connection.LocalUtils.ZipAsync(filePath, sourceEntries, "write", _stacksId, _includeSources).ConfigureAwait(false);
             return;
         }
 
@@ -149,7 +142,7 @@ private async Task DoStopChunkAsync(string filePath)
         {
             if (!string.IsNullOrEmpty(_stacksId))
             {
-                await _channel.Connection.LocalUtils.TraceDiscardedAsync(stacksId: _stacksId).ConfigureAwait(false);
+                await _connection.LocalUtils.TraceDiscardedAsync(stacksId: _stacksId).ConfigureAwait(false);
             }
             return;
         }
@@ -158,7 +151,7 @@ private async Task DoStopChunkAsync(string filePath)
         await artifact.SaveAsAsync(filePath).ConfigureAwait(false);
         await artifact.DeleteAsync().ConfigureAwait(false);
 
-        await _channel.Connection.LocalUtils.ZipAsync(filePath, new(), "append", _stacksId, _includeSources).ConfigureAwait(false);
+        await _connection.LocalUtils.ZipAsync(filePath, new(), "append", _stacksId, _includeSources).ConfigureAwait(false);
     }
 
     internal async Task<(Artifact Artifact, List<NameValue> Entries)> _TracingStopChunkAsync(string mode)
diff --git a/src/Playwright/Core/WebSocket.cs b/src/Playwright/Core/WebSocket.cs
index 43f3020930..1bcf3f026f 100644
--- a/src/Playwright/Core/WebSocket.cs
+++ b/src/Playwright/Core/WebSocket.cs
@@ -26,20 +26,17 @@
 using System.Text.Json;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class WebSocket : ChannelOwnerBase, IChannelOwner<WebSocket>, IWebSocket
+internal class WebSocket : ChannelOwnerBase, IWebSocket
 {
     private const int OpcodeBase64 = 2;
-    private readonly WebSocketChannel _channel;
     private readonly WebSocketInitializer _initializer;
 
-    internal WebSocket(IChannelOwner parent, string guid, WebSocketInitializer initializer) : base(parent, guid)
+    internal WebSocket(ChannelOwnerBase parent, string guid, WebSocketInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         _initializer = initializer;
     }
 
@@ -51,10 +48,6 @@ internal WebSocket(IChannelOwner parent, string guid, WebSocketInitializer initi
 
     public event EventHandler<string> SocketError;
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<WebSocket> IChannelOwner<WebSocket>.Channel => _channel;
-
     public string Url => _initializer.Url;
 
     public bool IsClosed { get; internal set; }
diff --git a/src/Playwright/Core/Worker.cs b/src/Playwright/Core/Worker.cs
index 70ba0c00e1..8ca75a5675 100644
--- a/src/Playwright/Core/Worker.cs
+++ b/src/Playwright/Core/Worker.cs
@@ -29,19 +29,17 @@
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
+
 using Microsoft.Playwright.Transport.Protocol;
 
 namespace Microsoft.Playwright.Core;
 
-internal class Worker : ChannelOwnerBase, IChannelOwner<Worker>, IWorker
+internal class Worker : ChannelOwnerBase, IWorker
 {
-    private readonly WorkerChannel _channel;
     private readonly WorkerInitializer _initializer;
 
-    public Worker(IChannelOwner parent, string guid, WorkerInitializer initializer) : base(parent, guid)
+    public Worker(ChannelOwnerBase parent, string guid, WorkerInitializer initializer) : base(parent, guid)
     {
-        _channel = new(guid, parent.Connection, this);
         _initializer = initializer;
     }
 
@@ -49,10 +47,6 @@ public Worker(IChannelOwner parent, string guid, WorkerInitializer initializer)
 
     public string Url => _initializer.Url;
 
-    ChannelBase IChannelOwner.Channel => _channel;
-
-    IChannel<Worker> IChannelOwner<Worker>.Channel => _channel;
-
     internal Page Page { get; set; }
 
     internal BrowserContext Context { get; set; }
diff --git a/src/Playwright/Core/WritableStream.cs b/src/Playwright/Core/WritableStream.cs
index 7498eb0a99..dec9feb7c9 100644
--- a/src/Playwright/Core/WritableStream.cs
+++ b/src/Playwright/Core/WritableStream.cs
@@ -29,23 +29,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Core;
 
-internal class WritableStream : ChannelOwnerBase, IChannelOwner<WritableStream>, IAsyncDisposable
+internal class WritableStream : ChannelOwnerBase, IAsyncDisposable
 {
-    internal WritableStream(IChannelOwner parent, string guid) : base(parent, guid)
+    internal WritableStream(ChannelOwnerBase parent, string guid) : base(parent, guid)
     {
-        Channel = new(guid, parent.Connection, this);
     }
 
-    ChannelBase IChannelOwner.Channel => Channel;
-
-    IChannel<WritableStream> IChannelOwner<WritableStream>.Channel => Channel;
-
-    public WritableStreamChannel Channel { get; }
-
     public WritableStreamImpl WritableStreamImpl => new(this);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
diff --git a/src/Playwright/Helpers/ChannelHelpers.cs b/src/Playwright/Helpers/ChannelHelpers.cs
index be7c45a7e1..bdb85e4e7a 100644
--- a/src/Playwright/Helpers/ChannelHelpers.cs
+++ b/src/Playwright/Helpers/ChannelHelpers.cs
@@ -24,7 +24,6 @@
 using System;
 using System.Text.Json;
 using Microsoft.Playwright.Transport;
-using Microsoft.Playwright.Transport.Channels;
 
 #nullable enable
 #pragma warning disable IDE0018 // Inline variable declaration will cause issues due to Roslyn design: https://github.com/dotnet/roslyn/issues/54711
@@ -55,7 +54,7 @@ internal static class ChannelHelpers
     }
 
     internal static T? GetObject<T>(this JsonElement? element, string name, Connection connection)
-        where T : ChannelOwnerBase, IChannelOwner<T>
+        where T : ChannelOwnerBase
     {
         if (!element.HasValue)
         {
@@ -73,7 +72,7 @@ internal static class ChannelHelpers
     }
 
     internal static T GetObject<T>(this JsonElement element, string name, Connection connection)
-        where T : ChannelOwnerBase, IChannelOwner<T>
+        where T : ChannelOwnerBase
     {
         var result = GetObject<T>((JsonElement?)element, name, connection);
         if (result == null)
diff --git a/src/Playwright/Helpers/SetInputFilesHelpers.cs b/src/Playwright/Helpers/SetInputFilesHelpers.cs
index d56e9c2a5b..386d187aa7 100644
--- a/src/Playwright/Helpers/SetInputFilesHelpers.cs
+++ b/src/Playwright/Helpers/SetInputFilesHelpers.cs
@@ -45,7 +45,7 @@ public static async Task<SetInputFilesFiles> ConvertInputFilesAsync(IEnumerable<
                 Payloads = Array.Empty<InputFilesList>(),
             };
         }
-        if (context.Channel.Connection.IsRemote)
+        if (context._connection.IsRemote)
         {
             var streams = await files.SelectAsync(async f =>
             {
diff --git a/src/Playwright/Transport/ChannelOwnerBase.cs b/src/Playwright/Transport/ChannelOwnerBase.cs
index 028da4d9fe..aaa05053a8 100644
--- a/src/Playwright/Transport/ChannelOwnerBase.cs
+++ b/src/Playwright/Transport/ChannelOwnerBase.cs
@@ -29,23 +29,23 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Playwright.Helpers;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Transport;
 
-internal class ChannelOwnerBase : IChannelOwner
+internal class ChannelOwnerBase
 {
     internal readonly Connection _connection;
     private readonly ConcurrentDictionary<string, ChannelOwnerBase> _objects = new();
+
     internal bool _wasCollected;
 
-    internal ChannelOwnerBase(IChannelOwner parent, string guid) : this(parent, null, guid)
+    internal ChannelOwnerBase(ChannelOwnerBase parent, string guid) : this(parent, null, guid)
     {
     }
 
-    internal ChannelOwnerBase(IChannelOwner parent, Connection connection, string guid)
+    internal ChannelOwnerBase(ChannelOwnerBase parent, Connection connection, string guid)
     {
-        _connection = parent?.Connection ?? connection;
+        _connection = parent?._connection ?? connection;
 
         Guid = guid;
         Parent = parent;
@@ -57,18 +57,12 @@ internal ChannelOwnerBase(IChannelOwner parent, Connection connection, string gu
         }
     }
 
-    /// <inheritdoc/>
-    Connection IChannelOwner.Connection => _connection;
-
-    /// <inheritdoc/>
-    ChannelBase IChannelOwner.Channel => null;
+    internal ConcurrentDictionary<string, ChannelOwnerBase> Objects => _objects;
 
-    /// <inheritdoc/>
-    ConcurrentDictionary<string, ChannelOwnerBase> IChannelOwner.Objects => _objects;
 
     internal string Guid { get; set; }
 
-    internal IChannelOwner Parent { get; set; }
+    internal ChannelOwnerBase Parent { get; set; }
 
     internal virtual void OnMessage(string method, JsonElement? serverParams)
     {
diff --git a/src/Playwright/Transport/Channels/APIRequestContextChannel.cs b/src/Playwright/Transport/Channels/APIRequestContextChannel.cs
deleted file mode 100644
index e7f26eb54e..0000000000
--- a/src/Playwright/Transport/Channels/APIRequestContextChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class APIRequestContextChannel : Channel<APIRequestContext>
-{
-    public APIRequestContextChannel(string guid, Connection connection, APIRequestContext owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/ArtifactChannel.cs b/src/Playwright/Transport/Channels/ArtifactChannel.cs
deleted file mode 100644
index bc8f0a6496..0000000000
--- a/src/Playwright/Transport/Channels/ArtifactChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* MIT License
-*
-* Copyright (c) Microsoft Corporation.
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class ArtifactChannel : Channel<Artifact>
-{
-    public ArtifactChannel(string guid, Connection connection, Artifact owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/BindingCallChannel.cs b/src/Playwright/Transport/Channels/BindingCallChannel.cs
deleted file mode 100644
index 3824dad8c8..0000000000
--- a/src/Playwright/Transport/Channels/BindingCallChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* MIT License
-*
-* Copyright (c) Microsoft Corporation.
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class BindingCallChannel : Channel<BindingCall>
-{
-    public BindingCallChannel(string guid, Connection connection, BindingCall owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/BrowserChannel.cs b/src/Playwright/Transport/Channels/BrowserChannel.cs
deleted file mode 100644
index 53cb05d091..0000000000
--- a/src/Playwright/Transport/Channels/BrowserChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class BrowserChannel : Channel<Browser>
-{
-    public BrowserChannel(string guid, Connection connection, Browser owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/BrowserContextChannel.cs b/src/Playwright/Transport/Channels/BrowserContextChannel.cs
deleted file mode 100644
index 1059517b13..0000000000
--- a/src/Playwright/Transport/Channels/BrowserContextChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class BrowserContextChannel : Channel<BrowserContext>
-{
-    public BrowserContextChannel(string guid, Connection connection, BrowserContext owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/BrowserTypeChannel.cs b/src/Playwright/Transport/Channels/BrowserTypeChannel.cs
deleted file mode 100644
index bcf3e13fc0..0000000000
--- a/src/Playwright/Transport/Channels/BrowserTypeChannel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class BrowserTypeChannel : Channel<Core.BrowserType>
-{
-    public BrowserTypeChannel(string guid, Connection connection, Core.BrowserType owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/CDPChannel.cs b/src/Playwright/Transport/Channels/CDPChannel.cs
deleted file mode 100644
index 5ef3f51a15..0000000000
--- a/src/Playwright/Transport/Channels/CDPChannel.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-using Microsoft.Playwright.Core;
-
-#nullable enable
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class CDPChannel : Channel<CDPSession>
-{
-    public CDPChannel(string guid, Connection connection, CDPSession owner) : base(guid, connection, owner)
-    {
-    }
-}
-#nullable disable
diff --git a/src/Playwright/Transport/Channels/Channel.cs b/src/Playwright/Transport/Channels/Channel.cs
deleted file mode 100644
index cc7e6d3bd3..0000000000
--- a/src/Playwright/Transport/Channels/Channel.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class Channel<T> : ChannelBase, IChannel<T>
-    where T : ChannelOwnerBase, IChannelOwner<T>
-{
-    public Channel(string guid, Connection connection, T owner) : base(guid, connection)
-    {
-        Object = owner;
-    }
-
-    public virtual T Object { get; set; }
-}
diff --git a/src/Playwright/Transport/Channels/ChannelBase.cs b/src/Playwright/Transport/Channels/ChannelBase.cs
deleted file mode 100644
index 0594da6938..0000000000
--- a/src/Playwright/Transport/Channels/ChannelBase.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class ChannelBase
-{
-    public ChannelBase(string guid, Connection connection)
-    {
-        Guid = guid;
-        Connection = connection;
-    }
-
-    public string Guid { get; }
-
-    public Connection Connection { get; }
-}
diff --git a/src/Playwright/Transport/Channels/DialogChannel.cs b/src/Playwright/Transport/Channels/DialogChannel.cs
deleted file mode 100644
index 4f6f8325fe..0000000000
--- a/src/Playwright/Transport/Channels/DialogChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class DialogChannel : Channel<Dialog>
-{
-    public DialogChannel(string guid, Connection connection, Dialog owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/ElementHandleChannel.cs b/src/Playwright/Transport/Channels/ElementHandleChannel.cs
deleted file mode 100644
index 288d19ed8e..0000000000
--- a/src/Playwright/Transport/Channels/ElementHandleChannel.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020 Darío Kondratiuk
- * Modifications copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class ElementHandleChannel : JSHandleChannel, IChannel<ElementHandle>
-{
-    public ElementHandleChannel(string guid, Connection connection, ElementHandle owner) : base(guid, connection, owner)
-    {
-        Object = owner;
-    }
-
-    public new ElementHandle Object { get; set; }
-}
diff --git a/src/Playwright/Transport/Channels/FrameChannel.cs b/src/Playwright/Transport/Channels/FrameChannel.cs
deleted file mode 100644
index b682ce2a0c..0000000000
--- a/src/Playwright/Transport/Channels/FrameChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020 Darío Kondratiuk
- * Modifications copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class FrameChannel : Channel<Frame>
-{
-    public FrameChannel(string guid, Connection connection, Frame owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/IChannel.cs b/src/Playwright/Transport/Channels/IChannel.cs
deleted file mode 100644
index e0aa2971e6..0000000000
--- a/src/Playwright/Transport/Channels/IChannel.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-/// <summary>
-/// Channel interface.
-/// </summary>
-/// <typeparam name="T">Chanel object type.</typeparam>
-internal interface IChannel<T>
-    where T : ChannelOwnerBase, IChannelOwner<T>
-{
-    /// <summary>
-    /// Channel object.
-    /// </summary>
-    T Object { get; set; }
-}
diff --git a/src/Playwright/Transport/Channels/IChannelOwner.cs b/src/Playwright/Transport/Channels/IChannelOwner.cs
deleted file mode 100644
index 7c798360b0..0000000000
--- a/src/Playwright/Transport/Channels/IChannelOwner.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using System;
-using System.Collections.Concurrent;
-using System.Threading.Tasks;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-/// <summary>
-/// An IChannelOwner has the ability to build data coming from a Playwright server and convert it into a Playwright class.
-/// </summary>
-internal interface IChannelOwner
-{
-    /// <summary>
-    /// Connection.
-    /// </summary>
-    Connection Connection { get; }
-
-    /// <summary>
-    /// Channel.
-    /// </summary>
-    ChannelBase Channel { get; }
-
-    /// <summary>
-    /// Child objects.
-    /// </summary>
-    ConcurrentDictionary<string, ChannelOwnerBase> Objects { get; }
-
-    Task<T> WrapApiCallAsync<T>(Func<Task<T>> action, bool isInternal = false);
-
-    Task WrapApiBoundaryAsync(Func<Task> action);
-}
-
-/// <summary>
-/// An IChannelOwner has the ability to build data coming from a Playwright server and convert it into a Playwright class.
-/// </summary>
-/// <typeparam name="T">Channel Owner implementation.</typeparam>
-internal interface IChannelOwner<T> : IChannelOwner
-    where T : ChannelOwnerBase, IChannelOwner<T>
-{
-    /// <summary>
-    /// Channel.
-    /// </summary>
-    new IChannel<T> Channel { get; }
-}
diff --git a/src/Playwright/Transport/Channels/JSHandleChannel.cs b/src/Playwright/Transport/Channels/JSHandleChannel.cs
deleted file mode 100644
index cce86cec0f..0000000000
--- a/src/Playwright/Transport/Channels/JSHandleChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class JSHandleChannel : Channel<JSHandle>
-{
-    public JSHandleChannel(string guid, Connection connection, JSHandle owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/JsonPipeChannel.cs b/src/Playwright/Transport/Channels/JsonPipeChannel.cs
deleted file mode 100644
index 9750551390..0000000000
--- a/src/Playwright/Transport/Channels/JsonPipeChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class JsonPipeChannel : Channel<JsonPipe>
-{
-    public JsonPipeChannel(string guid, Connection connection, JsonPipe owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/LocalUtilsChannel.cs b/src/Playwright/Transport/Channels/LocalUtilsChannel.cs
deleted file mode 100644
index 7cd10a43be..0000000000
--- a/src/Playwright/Transport/Channels/LocalUtilsChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class LocalUtilsChannel : Channel<LocalUtils>
-{
-    public LocalUtilsChannel(string guid, Connection connection, LocalUtils owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/PageChannel.cs b/src/Playwright/Transport/Channels/PageChannel.cs
deleted file mode 100644
index bb5b444de9..0000000000
--- a/src/Playwright/Transport/Channels/PageChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2020 Darío Kondratiuk
- * Modifications copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class PageChannel : Channel<Page>
-{
-    public PageChannel(string guid, Connection connection, Page owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/PlaywrightChannel.cs b/src/Playwright/Transport/Channels/PlaywrightChannel.cs
deleted file mode 100644
index 763dac68fc..0000000000
--- a/src/Playwright/Transport/Channels/PlaywrightChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class PlaywrightChannel : Channel<PlaywrightImpl>
-{
-    public PlaywrightChannel(string guid, Connection connection, PlaywrightImpl owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/RequestChannel.cs b/src/Playwright/Transport/Channels/RequestChannel.cs
deleted file mode 100644
index 6a3ee7135e..0000000000
--- a/src/Playwright/Transport/Channels/RequestChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class RequestChannel : Channel<Request>
-{
-    public RequestChannel(string guid, Connection connection, Request owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/ResponseChannel.cs b/src/Playwright/Transport/Channels/ResponseChannel.cs
deleted file mode 100644
index 26815ac728..0000000000
--- a/src/Playwright/Transport/Channels/ResponseChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class ResponseChannel : Channel<Response>
-{
-    public ResponseChannel(string guid, Connection connection, Response owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/Root.cs b/src/Playwright/Transport/Channels/Root.cs
index fccc19d2e7..b06911f763 100644
--- a/src/Playwright/Transport/Channels/Root.cs
+++ b/src/Playwright/Transport/Channels/Root.cs
@@ -26,7 +26,7 @@ namespace Microsoft.Playwright.Transport.Channels;
 
 internal class Root : ChannelOwnerBase
 {
-    internal Root(IChannelOwner parent, Connection connection, string guid) : base(parent, connection, guid)
+    internal Root(ChannelOwnerBase parent, Connection connection, string guid) : base(parent, connection, guid)
     {
     }
 }
diff --git a/src/Playwright/Transport/Channels/RouteChannel.cs b/src/Playwright/Transport/Channels/RouteChannel.cs
deleted file mode 100644
index 8366ab7cbe..0000000000
--- a/src/Playwright/Transport/Channels/RouteChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class RouteChannel : Channel<Route>
-{
-    public RouteChannel(string guid, Connection connection, Route owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/SelectorsChannel.cs b/src/Playwright/Transport/Channels/SelectorsChannel.cs
deleted file mode 100644
index 19161abcde..0000000000
--- a/src/Playwright/Transport/Channels/SelectorsChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* MIT License
-*
-* Copyright (c) Microsoft Corporation.
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class SelectorsChannel : Channel<Selectors>
-{
-    public SelectorsChannel(string guid, Connection connection, Selectors owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/StreamChannel.cs b/src/Playwright/Transport/Channels/StreamChannel.cs
deleted file mode 100644
index 982e499522..0000000000
--- a/src/Playwright/Transport/Channels/StreamChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class StreamChannel : Channel<Stream>
-{
-    public StreamChannel(string guid, Connection connection, Stream owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/TracingChannel.cs b/src/Playwright/Transport/Channels/TracingChannel.cs
deleted file mode 100644
index c149c6369e..0000000000
--- a/src/Playwright/Transport/Channels/TracingChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class TracingChannel : Channel<Tracing>
-{
-    public TracingChannel(string guid, Connection connection, Tracing owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/WebSocketChannel.cs b/src/Playwright/Transport/Channels/WebSocketChannel.cs
deleted file mode 100644
index e199c43354..0000000000
--- a/src/Playwright/Transport/Channels/WebSocketChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class WebSocketChannel : Channel<WebSocket>
-{
-    public WebSocketChannel(string guid, Connection connection, WebSocket owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/WorkerChannel.cs b/src/Playwright/Transport/Channels/WorkerChannel.cs
deleted file mode 100644
index 6e025b52ac..0000000000
--- a/src/Playwright/Transport/Channels/WorkerChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class WorkerChannel : Channel<Worker>
-{
-    public WorkerChannel(string guid, Connection connection, Worker owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Channels/WritableStreamChannel.cs b/src/Playwright/Transport/Channels/WritableStreamChannel.cs
deleted file mode 100644
index fe947b5d3f..0000000000
--- a/src/Playwright/Transport/Channels/WritableStreamChannel.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) Microsoft Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using Microsoft.Playwright.Core;
-
-namespace Microsoft.Playwright.Transport.Channels;
-
-internal class WritableStreamChannel : Channel<WritableStream>
-{
-    public WritableStreamChannel(string guid, Connection connection, WritableStream owner) : base(guid, connection, owner)
-    {
-    }
-}
diff --git a/src/Playwright/Transport/Connection.cs b/src/Playwright/Transport/Connection.cs
index e1174ce3e7..8df3e52118 100644
--- a/src/Playwright/Transport/Connection.cs
+++ b/src/Playwright/Transport/Connection.cs
@@ -61,7 +61,6 @@ JsonSerializerOptions NewJsonSerializerOptions(bool keepNulls)
             options.Converters.Add(new ChannelToGuidConverter(this));
             options.Converters.Add(new ChannelOwnerToGuidConverter<JSHandle>(this));
             options.Converters.Add(new ChannelOwnerToGuidConverter<ElementHandle>(this));
-            options.Converters.Add(new ChannelOwnerToGuidConverter<IChannelOwner>(this));
 
             // Workaround for https://github.com/dotnet/runtime/issues/46522
             options.Converters.Add(new ChannelOwnerListToGuidListConverter<WritableStream>(this));
@@ -216,7 +215,7 @@ await _queue.EnqueueAsync(() =>
         {
             return default;
         }
-        else if (typeof(ChannelBase).IsAssignableFrom(typeof(T)) || typeof(ChannelBase[]).IsAssignableFrom(typeof(T)))
+        else if (typeof(ChannelOwnerBase).IsAssignableFrom(typeof(T)) || typeof(ChannelOwnerBase[]).IsAssignableFrom(typeof(T)))
         {
             var enumerate = result.Value.EnumerateObject();
 
@@ -230,7 +229,7 @@ await _queue.EnqueueAsync(() =>
         }
     }
 
-    internal IChannelOwner GetObject(string guid)
+    internal ChannelOwnerBase GetObject(string guid)
     {
         Objects.TryGetValue(guid, out var result);
         return result;
@@ -320,9 +319,9 @@ internal void Dispatch(PlaywrightServerMessage message)
         }
     }
 
-    private IChannelOwner CreateRemoteObject(string parentGuid, ChannelOwnerType type, string guid, JsonElement? initializer)
+    private ChannelOwnerBase CreateRemoteObject(string parentGuid, ChannelOwnerType type, string guid, JsonElement? initializer)
     {
-        IChannelOwner result = null;
+        ChannelOwnerBase result = null;
         var parent = string.IsNullOrEmpty(parentGuid) ? _rootObject : Objects[parentGuid];
 
 #pragma warning disable CA2000 // Dispose objects before losing scope
diff --git a/src/Playwright/Transport/Converters/ChannelOwnerListToGuidListConverter.cs b/src/Playwright/Transport/Converters/ChannelOwnerListToGuidListConverter.cs
index 01fcef99b7..471aa47d64 100644
--- a/src/Playwright/Transport/Converters/ChannelOwnerListToGuidListConverter.cs
+++ b/src/Playwright/Transport/Converters/ChannelOwnerListToGuidListConverter.cs
@@ -26,13 +26,12 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Transport.Converters;
 
 internal class ChannelOwnerListToGuidListConverter<T>
     : JsonConverter<IEnumerable<T>>
-    where T : class, IChannelOwner
+    where T : ChannelOwnerBase
 {
     private readonly Connection _connection;
 
@@ -55,7 +54,7 @@ public override void Write(Utf8JsonWriter writer, IEnumerable<T> value, JsonSeri
         foreach (T item in value)
         {
             writer.WriteStartObject();
-            writer.WriteString("guid", item.Channel.Guid);
+            writer.WriteString("guid", item.Guid);
             writer.WriteEndObject();
         }
         writer.WriteEndArray();
diff --git a/src/Playwright/Transport/Converters/ChannelOwnerToGuidConverter.cs b/src/Playwright/Transport/Converters/ChannelOwnerToGuidConverter.cs
index e98075caaf..1d616bef74 100644
--- a/src/Playwright/Transport/Converters/ChannelOwnerToGuidConverter.cs
+++ b/src/Playwright/Transport/Converters/ChannelOwnerToGuidConverter.cs
@@ -25,13 +25,12 @@
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Transport.Converters;
 
 internal class ChannelOwnerToGuidConverter<T>
     : JsonConverter<T>
-    where T : class, IChannelOwner
+    where T : ChannelOwnerBase
 {
     private readonly Connection _connection;
 
@@ -41,7 +40,7 @@ public ChannelOwnerToGuidConverter(Connection connection)
     }
 
     public override bool CanConvert(Type type)
-        => (typeof(T) == typeof(IChannelOwner) && typeof(T).IsAssignableFrom(type)) || type == typeof(T);
+        => (typeof(T) == typeof(ChannelOwnerBase) && typeof(T).IsAssignableFrom(type)) || type == typeof(T);
 
     public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
@@ -53,7 +52,7 @@ public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerial
     public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
     {
         writer.WriteStartObject();
-        writer.WriteString("guid", value.Channel.Guid);
+        writer.WriteString("guid", value.Guid);
         writer.WriteEndObject();
     }
 }
diff --git a/src/Playwright/Transport/Converters/ChannelToGuidConverter.cs b/src/Playwright/Transport/Converters/ChannelToGuidConverter.cs
index 1460f6fcbf..09f48f33ba 100644
--- a/src/Playwright/Transport/Converters/ChannelToGuidConverter.cs
+++ b/src/Playwright/Transport/Converters/ChannelToGuidConverter.cs
@@ -25,11 +25,10 @@
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Transport.Converters;
 
-internal class ChannelToGuidConverter : JsonConverter<ChannelBase>
+internal class ChannelToGuidConverter : JsonConverter<ChannelOwnerBase>
 {
     private readonly Connection _connection;
 
@@ -38,16 +37,16 @@ public ChannelToGuidConverter(Connection connection)
         _connection = connection;
     }
 
-    public override bool CanConvert(Type type) => typeof(ChannelBase).IsAssignableFrom(type);
+    public override bool CanConvert(Type type) => typeof(ChannelOwnerBase).IsAssignableFrom(type);
 
-    public override ChannelBase Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    public override ChannelOwnerBase Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         using JsonDocument document = JsonDocument.ParseValue(ref reader);
         string guid = document.RootElement.GetProperty("guid").ToString();
-        return _connection.GetObject(guid).Channel;
+        return _connection.GetObject(guid);
     }
 
-    public override void Write(Utf8JsonWriter writer, ChannelBase value, JsonSerializerOptions options)
+    public override void Write(Utf8JsonWriter writer, ChannelOwnerBase value, JsonSerializerOptions options)
     {
         writer.WriteStartObject();
         writer.WriteString("guid", value.Guid);
diff --git a/src/Playwright/Transport/Converters/EvaluateArgumentValueConverter.cs b/src/Playwright/Transport/Converters/EvaluateArgumentValueConverter.cs
index 608ec751ae..df4edc175b 100644
--- a/src/Playwright/Transport/Converters/EvaluateArgumentValueConverter.cs
+++ b/src/Playwright/Transport/Converters/EvaluateArgumentValueConverter.cs
@@ -35,7 +35,6 @@
 using System.Text.RegularExpressions;
 using Microsoft.Playwright.Core;
 using Microsoft.Playwright.Helpers;
-using Microsoft.Playwright.Transport.Channels;
 
 namespace Microsoft.Playwright.Transport.Converters;
 
@@ -173,9 +172,9 @@ internal static object Serialize(object value, List<EvaluateArgumentGuidElement>
             return new { a, id };
         }
 
-        if (value is IChannelOwner channelOwner)
+        if (value is ChannelOwnerBase channelOwner)
         {
-            handles.Add(new() { Guid = channelOwner.Channel.Guid });
+            handles.Add(new() { Guid = channelOwner.Guid });
             return new { h = handles.Count - 1 };
         }