diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml
index 313c1f105b2..6bb45fbc1a1 100644
--- a/lawnchair/res/values/strings.xml
+++ b/lawnchair/res/values/strings.xml
@@ -363,26 +363,6 @@
         <item>Don’t stay up too late!</item>
     </string-array>
 
-    <!-- Calendar -->
-    <string name="smartspace_calendar_now">now</string>
-    <string name="smartspace_calendar_in_time">in %1$s</string>
-    <plurals name="smartspace_calendar_minutes">
-        <item quantity="other">%d min</item>
-        <item quantity="one">%d min</item>
-    </plurals>
-    <plurals name="smartspace_calendar_hours">
-        <item quantity="other">%d hr</item>
-        <item quantity="one">%d hr</item>
-    </plurals>
-    <string name="smartspace_hours_mins">%1$s %2$s</string>
-    <string name="calendar_permission_needed">Warning: Lawnchair must have access to your calendar to show it</string>
-
-    <!-- Onboarding -->
-    <string name="onboarding">Onboarding</string>
-    <string name="onboarding_settings_title">Set Up %s</string>
-    <string name="onboarding_settings_summary">Touch &amp; hold on the Home Screen.</string>
-    <string name="onboarding_swipe_up">Swipe up to open the App Drawer.</string>
-
     <!-- Data and time format settings -->
     <string name="smartspace_calendar">Calendar</string>
     <string name="smartspace_date_and_time">Date &amp; time</string>
@@ -398,8 +378,6 @@
     <string name="smartspace_battery_status">Battery status</string>
     <string name="smartspace_now_playing">Now Playing</string>
     <string name="smartspace_personality_provider">Greetings</string>
-    <string name="smartspace_calendar_events">Calendar</string>
-    <string name="smartspace_onboarding_provider">Onboarding</string>
 
     <!-- Smartspacer strings -->
     <string name="maximum_number_of_targets">Maximum number of targets</string>
@@ -409,8 +387,6 @@
     <!-- Setup settings -->
     <string name="smartspace_requires_setup">Tap to set up</string>
     <string name="event_provider_missing_notification_dots">To use <xliff:g example="My Provider" id="providerName">%1$s</xliff:g>, turn on Notification Dots.</string>
-    <string name="event_provider_missing_calendar">To use <xliff:g example="Calendar" id="providerName">%1$s</xliff:g> provider, allow Lawnchair to access your calendar.</string>
-    <string name="title_missing_calendar">Calendar access needed</string>
 
     <!-- Toggle button for enabling Smartspace -->
     <string name="smartspace_widget_toggle_label">Show on home screen</string>
diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
index df815742bad..5d8d9551620 100644
--- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
+++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
@@ -550,16 +550,6 @@ class PreferenceManager2 private constructor(private val context: Context) : Pre
         defaultValue = false,
     )
 
-    val smartspaceCalendarEvents = preference(
-        key = booleanPreferencesKey("enable_smartspace_calendar"),
-        defaultValue = true,
-    )
-
-    val smartspaceOnboardingProvider = preference(
-        key = booleanPreferencesKey("enable_smartspace_onboarding_assist"),
-        defaultValue = true,
-    )
-
     val smartspaceShowDate = preference(
         key = booleanPreferencesKey("smartspace_show_date"),
         defaultValue = context.resources.getBoolean(R.bool.config_default_smartspace_show_date),
diff --git a/lawnchair/src/app/lawnchair/smartspace/model/SmartspaceScores.kt b/lawnchair/src/app/lawnchair/smartspace/model/SmartspaceScores.kt
index f3a2952a940..0d61e297bf8 100644
--- a/lawnchair/src/app/lawnchair/smartspace/model/SmartspaceScores.kt
+++ b/lawnchair/src/app/lawnchair/smartspace/model/SmartspaceScores.kt
@@ -5,9 +5,7 @@ object SmartspaceScores {
     const val SCORE_PERSONALITY = 1f
     const val SCORE_BATTERY = 2f
     const val SCORE_MEDIA = 3f
-    const val SCORE_CALENDAR = 4f
-    const val SCORE_ONBOARDING = 10f
 
     // Critical Information that must be displayed before anything else.
-    const val SCORE_LOW_BATTERY = 15f
+    const val SCORE_LOW_BATTERY = 10f
 }
diff --git a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceProvider.kt b/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceProvider.kt
index 2aa05ff1073..f43a59fd741 100644
--- a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceProvider.kt
+++ b/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceProvider.kt
@@ -22,9 +22,7 @@ class SmartspaceProvider private constructor(context: Context) {
         BatteryStatusProvider(context),
         NowPlayingProvider(context),
         PersonalityProvider(context),
-        CalendarEventProvider(context),
-        OnboardingProvider(context),
-    ).sortedBy { it.providerName } // TODO: Sort by SmartspaceScores? Should make it easier to make... ugh English SUCK
+    )
 
     private val state = dataSources
         .map { it.targets }