diff --git a/DeepDrftCms/Layout/CmsLayout.razor b/DeepDrftCms/Layout/CmsLayout.razor
index 2a830b9..52b7904 100644
--- a/DeepDrftCms/Layout/CmsLayout.razor
+++ b/DeepDrftCms/Layout/CmsLayout.razor
@@ -1,4 +1,3 @@
-@rendermode InteractiveServer
@inherits LayoutComponentBase
diff --git a/DeepDrftCms/Pages/Tracks/TrackEdit.razor b/DeepDrftCms/Pages/Tracks/TrackEdit.razor
index 5de4bfa..a10dd47 100644
--- a/DeepDrftCms/Pages/Tracks/TrackEdit.razor
+++ b/DeepDrftCms/Pages/Tracks/TrackEdit.razor
@@ -1,6 +1,4 @@
@page "/cms/tracks/{Id:int}"
-@* InteractiveServer: page injects ITrackService in-process; ITokenService reads localStorage via JS interop over the circuit. *@
-@rendermode InteractiveServer
@using AuthBlocksWeb.HierarchicalAuthorize
@using AuthBlocksWeb.Services
@using DeepDrftData
diff --git a/DeepDrftCms/Pages/Tracks/TrackList.razor b/DeepDrftCms/Pages/Tracks/TrackList.razor
index cedd5f9..ce38952 100644
--- a/DeepDrftCms/Pages/Tracks/TrackList.razor
+++ b/DeepDrftCms/Pages/Tracks/TrackList.razor
@@ -1,5 +1,4 @@
@page "/cms/tracks"
-@rendermode InteractiveServer
@using System.Net
@using System.Net.Http.Headers
@using AuthBlocksWeb.HierarchicalAuthorize
diff --git a/DeepDrftCms/Pages/Tracks/TrackNew.razor b/DeepDrftCms/Pages/Tracks/TrackNew.razor
index 11f38a4..f69bcab 100644
--- a/DeepDrftCms/Pages/Tracks/TrackNew.razor
+++ b/DeepDrftCms/Pages/Tracks/TrackNew.razor
@@ -1,5 +1,4 @@
@page "/cms/tracks/new"
-@rendermode InteractiveServer
@using System.Net.Http.Headers
@using AuthBlocksWeb.HierarchicalAuthorize
@using Microsoft.AspNetCore.Components.Forms
diff --git a/DeepDrftWeb.Client/Layout/MainLayout.razor b/DeepDrftWeb.Client/Layout/MainLayout.razor
index 2d0fbc4..1e87ab1 100644
--- a/DeepDrftWeb.Client/Layout/MainLayout.razor
+++ b/DeepDrftWeb.Client/Layout/MainLayout.razor
@@ -1,5 +1,4 @@
-@rendermode InteractiveWebAssembly
-@using DeepDrftWeb.Client.Controls
+@using DeepDrftWeb.Client.Controls
@using DeepDrftWeb.Client.Controls.AudioPlayerBar
@using DeepDrftWeb.Client.Services
@using DeepDrftWeb.Client.Common
diff --git a/DeepDrftWeb/Components/App.razor b/DeepDrftWeb/Components/App.razor
index 56c86fc..5d10bda 100644
--- a/DeepDrftWeb/Components/App.razor
+++ b/DeepDrftWeb/Components/App.razor
@@ -19,7 +19,7 @@
-
+