diff --git a/src/com/android/settings/spa/SpaEnvironment.kt b/src/com/android/settings/spa/SpaEnvironment.kt
index 489c8a8a926..febb2fd7b7e 100644
--- a/src/com/android/settings/spa/SpaEnvironment.kt
+++ b/src/com/android/settings/spa/SpaEnvironment.kt
@@ -46,7 +46,7 @@ object SpaEnvironment {
                 AppListNotificationsPageProvider,
             ) + togglePermissionAppListTemplate.createPageProviders(),
             rootPages = listOf(
-                SettingsPage(HomePageProvider.name),
+                SettingsPage.create(HomePageProvider.name),
             ),
         )
     }
diff --git a/src/com/android/settings/spa/app/AppsMain.kt b/src/com/android/settings/spa/app/AppsMain.kt
index b3ee12fb387..1a08140f745 100644
--- a/src/com/android/settings/spa/app/AppsMain.kt
+++ b/src/com/android/settings/spa/app/AppsMain.kt
@@ -56,7 +56,7 @@ object AppsMainPageProvider : SettingsPageProvider {
     }
 
     fun buildInjectEntry() =
-        SettingsEntryBuilder.createInject(SettingsPage.create(name)).setIsAllowSearch(false)
+        SettingsEntryBuilder.createInject(owner = SettingsPage.create(name)).setIsAllowSearch(false)
 
     override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
         val owner = SettingsPage.create(name, parameter, arguments)
diff --git a/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt b/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
index f7b1f8260ed..34575cbb3a9 100644
--- a/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
+++ b/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
@@ -46,7 +46,7 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {
     }
 
     fun buildInjectEntry() =
-        SettingsEntryBuilder.createInject(SettingsPage.create(name)).setIsAllowSearch(false)
+        SettingsEntryBuilder.createInject(owner = SettingsPage.create(name)).setIsAllowSearch(false)
 
     override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
         val owner = SettingsPage.create(name, parameter, arguments)
diff --git a/src/com/android/settings/spa/home/HomePage.kt b/src/com/android/settings/spa/home/HomePage.kt
index 424d91ffa34..3153944804d 100644
--- a/src/com/android/settings/spa/home/HomePage.kt
+++ b/src/com/android/settings/spa/home/HomePage.kt
@@ -17,12 +17,9 @@
 package com.android.settings.spa.home
 
 import android.os.Bundle
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.android.settings.R
-import com.android.settings.spa.SpaEnvironment
 import com.android.settings.spa.app.AppsMainPageProvider
 import com.android.settings.spa.notification.NotificationMainPageProvider
 import com.android.settingslib.spa.framework.common.SettingsEntry
@@ -51,16 +48,5 @@ private fun HomePage() {
     HomeScaffold(title = stringResource(R.string.settings_label)) {
         AppsMainPageProvider.EntryItem()
         NotificationMainPageProvider.EntryItem()
-
-        /**
-         * A test button to generate hierarchy.
-         * TODO: remove it once the content provider is ready.
-         */
-        Button(onClick = {
-            SpaEnvironment.settingsEntryRepository.printAllPages()
-            SpaEnvironment.settingsEntryRepository.printAllEntries()
-        }) {
-            Text(text = "Generate Entry")
-        }
     }
 }