diff --git a/src/BlazorBindings.Maui/MauiBlazorBindingsRenderer.cs b/src/BlazorBindings.Maui/MauiBlazorBindingsRenderer.cs
index e967a17a..524f430a 100644
--- a/src/BlazorBindings.Maui/MauiBlazorBindingsRenderer.cs
+++ b/src/BlazorBindings.Maui/MauiBlazorBindingsRenderer.cs
@@ -43,41 +43,9 @@ public Task AddComponent(Type componentType, MC.Application parent, Dictionary<s
             return addComponentTask;
         }
 
-        public Task<TComponent> AddComponent<TComponent>(MC.Element parent, Dictionary<string, object> parameters = null) where TComponent : IComponent
+        public Task AddComponent<T>(MC.Application parent, Dictionary<string, object> parameters = null)
         {
-            var task = AddComponent(typeof(TComponent), parent, parameters);
-            return Cast(task);
-
-            static async Task<TComponent> Cast(Task<IComponent> task) => (TComponent)await task;
-        }
-
-        public Task<IComponent> AddComponent(Type componentType, MC.Element parent, Dictionary<string, object> parameters = null)
-        {
-            var componentTask = AddComponentLocal();
-
-            if (componentTask.Exception != null)
-            {
-                // If exception was thrown during the sync execution - throw it straight away.
-                ExceptionDispatchInfo.Throw(componentTask.Exception.InnerException);
-            }
-
-            return componentTask;
-
-            async Task<IComponent> AddComponentLocal()
-            {
-                var elementsComponentTask = GetElementsFromRenderedComponent(componentType, parameters);
-
-                if (!elementsComponentTask.IsCompleted && parent is MC.Application app)
-                {
-                    // MAUI requires the Application to have the MainPage. If rendering task is not completed synchronously,
-                    // we need to set MainPage to something.
-                    app.MainPage ??= new MC.ContentPage();
-                }
-
-                var (elements, componentTask) = await elementsComponentTask;
-                await SetChildContent(parent, elements);
-                return await componentTask;
-            }
+            return AddComponent(typeof(T), parent, parameters);
         }
 
         protected override void HandleException(Exception exception)
@@ -120,69 +88,5 @@ protected override ElementManager CreateNativeControlManager()
 
             return (container.Elements, addComponentTask);
         }
-
-        private static Task SetChildContent(MC.BindableObject parent, List<MC.BindableObject> children)
-        {
-            switch (parent)
-            {
-                case MC.NavigationPage page:
-                    return page.PushAsync(CastSingle<MC.Page>(children));
-
-                case MC.Application application:
-                    application.MainPage = CastSingle<MC.Page>(children);
-                    break;
-                case MC.ContentPage contentPage:
-                    contentPage.Content = CastSingle<MC.View>(children);
-                    break;
-                case MC.ContentView contentView:
-                    contentView.Content = CastSingle<MC.View>(children);
-                    break;
-                case MC.FlyoutPage flyoutPage:
-                    flyoutPage.Detail = CastSingle<MC.Page>(children);
-                    break;
-                case MC.ScrollView scrollView:
-                    scrollView.Content = CastSingle<MC.View>(children);
-                    break;
-                case MC.ShellContent shellContent:
-                    shellContent.Content = CastSingle<MC.Page>(children);
-                    break;
-                case MC.StackBase stackBase:
-                    foreach (var child in children)
-                        stackBase.Children.Add(Cast<MC.View>(child));
-                    break;
-                case MC.TabbedPage tabbedPage:
-                    foreach (var child in children)
-                        tabbedPage.Children.Add(Cast<MC.Page>(child));
-                    break;
-                case MC.Shell shell:
-                    foreach (var child in children)
-                        shell.Items.Add(Cast<MC.TemplatedPage>(child));
-                    break;
-                case MC.ShellItem shellItem:
-                    foreach (var child in children)
-                        shellItem.Items.Add(Cast<MC.TemplatedPage>(child));
-                    break;
-                case MC.ShellSection shellSection:
-                    foreach (var child in children)
-                        shellSection.Items.Add(Cast<MC.TemplatedPage>(child));
-                    break;
-
-                default:
-                    throw new InvalidOperationException($"Renderer doesn't support {parent?.GetType()?.Name} as a parent element.");
-            };
-
-            return Task.CompletedTask;
-
-            static T CastSingle<T>(List<MC.BindableObject> children) where T : MC.BindableObject
-            {
-                if (children.Count != 1)
-                    throw new InvalidOperationException("The target component must have exactly one root element.");
-
-                return Cast<T>(children[0]);
-            }
-
-            static T Cast<T>(MC.BindableObject e) where T : class
-                => e as T ?? throw new InvalidOperationException($"{typeof(T).Name} element expected, but {e?.GetType()?.Name} found.");
-        }
     }
 }
diff --git a/src/BlazorBindings.UnitTests/Components/ButtonWithAnExceptionOnClick.razor b/src/BlazorBindings.UnitTests/Components/PageWithButtonWithExceptionOnClick.razor
similarity index 66%
rename from src/BlazorBindings.UnitTests/Components/ButtonWithAnExceptionOnClick.razor
rename to src/BlazorBindings.UnitTests/Components/PageWithButtonWithExceptionOnClick.razor
index 2153ed1d..a221aba7 100644
--- a/src/BlazorBindings.UnitTests/Components/ButtonWithAnExceptionOnClick.razor
+++ b/src/BlazorBindings.UnitTests/Components/PageWithButtonWithExceptionOnClick.razor
@@ -1,4 +1,7 @@
-<Button OnClick="Fail" />
+<ContentPage>
+    <Button OnClick="Fail" />
+</ContentPage>
+
 @code {
     async Task Fail()
     {
diff --git a/src/BlazorBindings.UnitTests/MauiBlazorBindingsRendererTests.cs b/src/BlazorBindings.UnitTests/MauiBlazorBindingsRendererTests.cs
index 3de9f6a5..cca88e6e 100644
--- a/src/BlazorBindings.UnitTests/MauiBlazorBindingsRendererTests.cs
+++ b/src/BlazorBindings.UnitTests/MauiBlazorBindingsRendererTests.cs
@@ -17,53 +17,19 @@ public MauiBlazorBindingsRendererTests()
             MC.Application.Current = _application;
         }
 
-        [TestCase(typeof(MC.ContentView))]
-        [TestCase(typeof(MC.ContentPage))]
-        [TestCase(typeof(MC.ScrollView))]
-        [TestCase(typeof(MC.StackLayout))]
-        [TestCase(typeof(MC.VerticalStackLayout))]
-        [TestCase(typeof(MC.HorizontalStackLayout))]
-        public async Task RenderToExistingControl_NonPageContent(Type containerType)
-        {
-            var control = (MC.Element)Activator.CreateInstance(containerType);
-
-            await _renderer.AddComponent<NonPageContent>(control);
-
-            var content = GetChildContent(control);
-            NonPageContent.ValidateContent(content);
-        }
-
-        [TestCase(typeof(MC.Application))]
-        [TestCase(typeof(MC.FlyoutPage))]
-        [TestCase(typeof(MC.TabbedPage))]
-        [TestCase(typeof(MC.Shell))]
-        [TestCase(typeof(MC.ShellContent))]
-        [TestCase(typeof(MC.ShellSection))]
-        public async Task RenderToExistingControl_PageContent(Type containerType)
-        {
-            var control = (MC.Element)Activator.CreateInstance(containerType);
-
-            await _renderer.AddComponent<PageContent>(control);
-
-            var content = GetChildContent(control);
-            PageContent.ValidateContent(content);
-        }
-
         [Test]
-        public async Task RenderToExistingControl_MultipleChildren()
+        public async Task RenderToApplication_PageContent()
         {
-            var control = new MC.TabbedPage();
-
-            await _renderer.AddComponent<MultiplePagesContent>(control);
+            await _renderer.AddComponent<PageContent>(_application);
 
-            var pages = control.Children;
-            Assert.That(pages.Select(p => p.Title), Is.EqualTo(new[] { "Page1", "Page2", "Page3" }));
+            var content = _application.MainPage;
+            PageContent.ValidateContent(content);
         }
 
         [Test]
         public void ShouldThrowExceptionIfHappenedDuringSyncRender()
         {
-            void action() => _ = _renderer.AddComponent<ComponentWithException>(new MC.NavigationPage());
+            void action() => _ = _renderer.AddComponent<ComponentWithException>(_application);
 
             Assert.That(action, Throws.InvalidOperationException.With.Message.EqualTo("Should fail here."));
         }
@@ -73,9 +39,8 @@ public async Task RendererShouldHandleAsyncExceptions()
         {
             _renderer.ThrowExceptions = false;
 
-            var contentView = new MC.ContentView();
-            await _renderer.AddComponent<ButtonWithAnExceptionOnClick>(contentView);
-            var button = (MC.Button)contentView.Content;
+            await _renderer.AddComponent<PageWithButtonWithExceptionOnClick>(_application);
+            var button = (MC.Button)((MC.ContentPage)_application.MainPage).Content;
             button.SendClicked();
 
             Assert.That(() => _renderer.Exceptions, Is.Not.Empty.After(1000, 10));
@@ -99,23 +64,5 @@ public async Task RenderedComponentShouldBeAbleToReplaceMainPage()
 
             Assert.That(_application.MainPage.Title, Is.EqualTo("Page1"));
         }
-
-        private static MC.Element GetChildContent(MC.Element container)
-        {
-            return container switch
-            {
-                MC.Application app => app.MainPage,
-                MC.ContentPage contentPage => contentPage.Content,
-                MC.ContentView contentView => contentView.Content,
-                MC.ScrollView scrollView => scrollView.Content,
-                MC.StackBase stackBase => (MC.Element)stackBase.Children[0],
-                MC.FlyoutPage flyoutPage => flyoutPage.Detail,
-                MC.TabbedPage tabbedPage => tabbedPage.Children[0],
-                MC.Shell shell => (MC.Element)shell.Items[0].Items[0].Items[0].Content,
-                MC.ShellSection shellContent => (MC.Element)shellContent.Items[0].Content,
-                MC.ShellContent shellContent => (MC.Element)shellContent.Content,
-                _ => throw new NotSupportedException("Unexpected parent type.")
-            };
-        }
     }
 }