diff --git a/CMakeModules/FindLLVM.cmake b/CMakeModules/FindLLVM.cmake
index 8dc064d5d1..efbd0ca460 100644
--- a/CMakeModules/FindLLVM.cmake
+++ b/CMakeModules/FindLLVM.cmake
@@ -19,7 +19,7 @@ if (LLVM_FOUND AND LLVM_Demangle_FOUND AND NOT TARGET LLVM::Demangle)
     target_include_directories(LLVM::Demangle INTERFACE ${LLVM_INCLUDE_DIRS})
     # prefer shared LLVM: https://github.com/llvm/llvm-project/issues/34593
     # but use ugly hack because llvm_config doesn't support interface library
-    add_library(_dummy_lib SHARED EXCLUDE_FROM_ALL ${CMAKE_SOURCE_DIR}/src/yuzu/main.cpp)
+    add_library(_dummy_lib SHARED EXCLUDE_FROM_ALL src/yuzu/main.cpp)
     llvm_config(_dummy_lib USE_SHARED demangle)
     get_target_property(LLVM_LIBRARIES _dummy_lib LINK_LIBRARIES)
     target_link_libraries(LLVM::Demangle INTERFACE ${LLVM_LIBRARIES})
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
index a558afab47..21dc51513d 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
@@ -17,7 +17,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     RENDERER_USE_SPEED_LIMIT("use_speed_limit"),
     USE_FAST_CPU_TIME("use_fast_cpu_time"),
     USE_CUSTOM_CPU_TICKS("use_custom_cpu_ticks"),
-    SKIP_CPU_INNER_INVALIDATION("skip_cpu_inner_invalidation"),
     USE_DOCKED_MODE("use_docked_mode"),
     USE_AUTO_STUB("use_auto_stub"),
     RENDERER_USE_DISK_SHADER_CACHE("use_disk_shader_cache"),
@@ -59,9 +58,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     SHOW_APP_RAM_USAGE("show_app_ram_usage"),
     SHOW_SYSTEM_RAM_USAGE("show_system_ram_usage"),
     SHOW_BAT_TEMPERATURE("show_bat_temperature"),
-    SHOW_POWER_INFO("show_power_info"),
     SHOW_SHADERS_BUILDING("show_shaders_building"),
-
     DEBUG_FLUSH_BY_LINE("flush_lines"),
     USE_LRU_CACHE("use_lru_cache"),;
 
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
index a674857bc1..63206e0bee 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
@@ -42,7 +42,7 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     FAST_CPU_TIME("fast_cpu_time"),
     CPU_TICKS("cpu_ticks"),
     FAST_GPU_TIME("fast_gpu_time"),
-    BAT_TEMPERATURE_UNIT("bat_temperature_unit"),
+
     CABINET_APPLET("cabinet_applet_mode"),
     CONTROLLER_APPLET("controller_applet_mode"),
     DATA_ERASE_APPLET("data_erase_applet_mode"),
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
index ec56362f77..f225d8d8b7 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@@ -78,7 +78,7 @@ abstract class SettingsItem(
 
     val needsRuntimeGlobal: Boolean
         get() = NativeLibrary.isRunning() && !setting.global &&
-                !NativeConfig.isPerGameConfigLoaded()
+            !NativeConfig.isPerGameConfigLoaded()
 
     val clearable: Boolean
         get() = !setting.global && NativeConfig.isPerGameConfigLoaded()
@@ -260,12 +260,12 @@ abstract class SettingsItem(
                 )
             )
             put(
-                SwitchSetting(
-                    BooleanSetting.CORE_SYNC_CORE_SPEED,
-                    titleId = R.string.use_sync_core,
-                    descriptionId = R.string.use_sync_core_description
-                )
-            )
+                 SwitchSetting(
+                     BooleanSetting.CORE_SYNC_CORE_SPEED,
+                     titleId = R.string.use_sync_core,
+                     descriptionId = R.string.use_sync_core_description
+                 )
+             )
 
             put(
                 SingleChoiceSetting(
@@ -443,21 +443,6 @@ abstract class SettingsItem(
                     descriptionId = R.string.show_bat_temperature_description
                 )
             )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.BAT_TEMPERATURE_UNIT,
-                    R.string.bat_temperature_unit,
-                    choicesId = R.array.temperatureUnitEntries,
-                    valuesId = R.array.temperatureUnitValues
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.SHOW_POWER_INFO,
-                    R.string.show_power_info,
-                    descriptionId = R.string.show_power_info_description
-                )
-            )
             put(
                 SwitchSetting(
                     BooleanSetting.SHOW_SHADERS_BUILDING,
@@ -655,13 +640,6 @@ abstract class SettingsItem(
                     max = 65535
                 )
             )
-            put(
-                SwitchSetting(
-                    BooleanSetting.SKIP_CPU_INNER_INVALIDATION,
-                    titleId = R.string.skip_cpu_inner_invalidation,
-                    descriptionId = R.string.skip_cpu_inner_invalidation_description
-                )
-            )
             put(
                 SwitchSetting(
                     BooleanSetting.RENDERER_REACTIVE_FLUSHING,
@@ -710,12 +688,12 @@ abstract class SettingsItem(
                 )
             )
             put(
-                SwitchSetting(
-                    BooleanSetting.USE_AUTO_STUB,
-                    titleId = R.string.use_auto_stub,
-                    descriptionId = R.string.use_auto_stub_description
-                )
-            )
+                 SwitchSetting(
+                     BooleanSetting.USE_AUTO_STUB,
+                     titleId = R.string.use_auto_stub,
+                     descriptionId = R.string.use_auto_stub_description
+                 )
+             )
             put(
                 SwitchSetting(
                     BooleanSetting.CPU_DEBUG_MODE,
@@ -727,7 +705,7 @@ abstract class SettingsItem(
             val fastmem = object : AbstractBooleanSetting {
                 override fun getBoolean(needsGlobal: Boolean): Boolean =
                     BooleanSetting.FASTMEM.getBoolean() &&
-                            BooleanSetting.FASTMEM_EXCLUSIVES.getBoolean()
+                        BooleanSetting.FASTMEM_EXCLUSIVES.getBoolean()
 
                 override fun setBoolean(value: Boolean) {
                     BooleanSetting.FASTMEM.setBoolean(value)
@@ -742,7 +720,7 @@ abstract class SettingsItem(
                 override var global: Boolean
                     get() {
                         return BooleanSetting.FASTMEM.global &&
-                                BooleanSetting.FASTMEM_EXCLUSIVES.global
+                            BooleanSetting.FASTMEM_EXCLUSIVES.global
                     }
                     set(value) {
                         BooleanSetting.FASTMEM.global = value
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
index 31e2873b58..0cf7be74d3 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -260,8 +260,6 @@ class SettingsFragmentPresenter(
             add(BooleanSetting.SHOW_APP_RAM_USAGE.key)
             add(BooleanSetting.SHOW_SYSTEM_RAM_USAGE.key)
             add(BooleanSetting.SHOW_BAT_TEMPERATURE.key)
-            add(IntSetting.BAT_TEMPERATURE_UNIT.key)
-            add(BooleanSetting.SHOW_POWER_INFO.key)
             add(BooleanSetting.SHOW_SHADERS_BUILDING.key)
         }
     }
@@ -463,7 +461,6 @@ class SettingsFragmentPresenter(
             add(IntSetting.FAST_CPU_TIME.key)
             add(BooleanSetting.USE_CUSTOM_CPU_TICKS.key)
             add(IntSetting.CPU_TICKS.key)
-            add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key)
             add(BooleanSetting.USE_LRU_CACHE.key)
             add(BooleanSetting.CORE_SYNC_CORE_SPEED.key)
             add(IntSetting.MEMORY_LAYOUT.key)
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
index 05c14e278d..9ba2d9e625 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@@ -17,7 +17,6 @@ import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.net.Uri
 import android.os.BatteryManager
-import android.os.BatteryManager.*
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -575,13 +574,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 if (emulationViewModel.emulationStarted.value &&
                     !emulationViewModel.isEmulationStopping.value
                 ) {
-                    val needsGlobal = NativeConfig.isPerGameConfigLoaded()
                     sb.setLength(0)
 
                     val perfStats = NativeLibrary.getPerfStats()
                     val actualFps = perfStats[FPS]
 
-                    if (BooleanSetting.SHOW_FPS.getBoolean(needsGlobal)) {
+                    if (BooleanSetting.SHOW_FPS.getBoolean(NativeConfig.isPerGameConfigLoaded())) {
                         val enableFrameInterpolation =
                             BooleanSetting.FRAME_INTERPOLATION.getBoolean()
 //                        val enableFrameSkipping = BooleanSetting.FRAME_SKIPPING.getBoolean()
@@ -599,7 +597,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         sb.append(fpsText)
                     }
 
-                    if (BooleanSetting.SHOW_FRAMETIME.getBoolean(needsGlobal)) {
+                    if (BooleanSetting.SHOW_FRAMETIME.getBoolean(NativeConfig.isPerGameConfigLoaded())) {
                         if (sb.isNotEmpty()) sb.append(" | ")
                         sb.append(
                             String.format(
@@ -609,14 +607,13 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         )
                     }
 
-                    if (BooleanSetting.SHOW_APP_RAM_USAGE.getBoolean(needsGlobal)) {
+                    if (BooleanSetting.SHOW_APP_RAM_USAGE.getBoolean(NativeConfig.isPerGameConfigLoaded())) {
                         if (sb.isNotEmpty()) sb.append(" | ")
-                        val appRamUsage =
-                            File("/proc/self/statm").readLines()[0].split(' ')[1].toLong() * 4096 / 1000000
+                        val appRamUsage = File("/proc/self/statm").readLines()[0].split(' ')[1].toLong() * 4096 / 1000000
                         sb.append(getString(R.string.process_ram, appRamUsage))
                     }
 
-                    if (BooleanSetting.SHOW_SYSTEM_RAM_USAGE.getBoolean(needsGlobal)) {
+                    if (BooleanSetting.SHOW_SYSTEM_RAM_USAGE.getBoolean(NativeConfig.isPerGameConfigLoaded())) {
                         if (sb.isNotEmpty()) sb.append(" | ")
                         context?.let { ctx ->
                             val activityManager =
@@ -628,35 +625,16 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         }
                     }
 
-                    if (BooleanSetting.SHOW_BAT_TEMPERATURE.getBoolean(needsGlobal)) {
+                    if (BooleanSetting.SHOW_BAT_TEMPERATURE.getBoolean(NativeConfig.isPerGameConfigLoaded())) {
                         if (sb.isNotEmpty()) sb.append(" | ")
-
                         val batteryTemp = getBatteryTemperature()
-                        when (IntSetting.BAT_TEMPERATURE_UNIT.getInt(needsGlobal)) {
-                            0 -> sb.append(String.format("%.1f°C", batteryTemp))
-                            1 -> sb.append(String.format("%.1f°F", celsiusToFahrenheit(batteryTemp)))
-                        }
-                    }
-
-                    if (BooleanSetting.SHOW_POWER_INFO.getBoolean(needsGlobal)) {
-                        if (sb.isNotEmpty()) sb.append(" | ")
-
-                        val battery: BatteryManager =
-                            requireContext().getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-
-                        val capacity = battery.getIntProperty(BATTERY_PROPERTY_CAPACITY)
-                        val nowUAmps = battery.getIntProperty(BATTERY_PROPERTY_CURRENT_NOW)
-
-                        sb.append(String.format("%.1fA (%d%%)", nowUAmps / 1000000.0, capacity))
-
-                        if (battery.isCharging || nowUAmps > 0.0) {
-                            sb.append(" ${getString(R.string.charging)}")
-                        }
+                        val tempF = celsiusToFahrenheit(batteryTemp)
+                        sb.append(String.format("%.1f°C/%.1f°F", batteryTemp, tempF))
                     }
 
                     val shadersBuilding = NativeLibrary.getShadersBuilding()
 
-                    if (BooleanSetting.SHOW_SHADERS_BUILDING.getBoolean(needsGlobal) && shadersBuilding != 0) {
+                    if (BooleanSetting.SHOW_SHADERS_BUILDING.getBoolean(NativeConfig.isPerGameConfigLoaded()) && shadersBuilding != 0) {
                         if (sb.isNotEmpty()) sb.append(" | ")
 
                         val prefix = getString(R.string.shaders_prefix)
@@ -664,7 +642,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         sb.append(String.format("$prefix %d $suffix", shadersBuilding))
                     }
 
-                    if (BooleanSetting.PERF_OVERLAY_BACKGROUND.getBoolean(needsGlobal)) {
+                    if (BooleanSetting.PERF_OVERLAY_BACKGROUND.getBoolean(NativeConfig.isPerGameConfigLoaded())) {
                         binding.showStatsOverlayText.setBackgroundResource(R.color.yuzu_transparent_black)
                     } else {
                         binding.showStatsOverlayText.setBackgroundResource(0)
diff --git a/src/android/app/src/main/jni/android_settings.h b/src/android/app/src/main/jni/android_settings.h
index cd18f1e5b3..e7401a8947 100644
--- a/src/android/app/src/main/jni/android_settings.h
+++ b/src/android/app/src/main/jni/android_settings.h
@@ -9,7 +9,6 @@
 #include <common/settings_common.h>
 #include "common/common_types.h"
 #include "common/settings_setting.h"
-#include "common/settings_enums.h"
 
 namespace AndroidSettings {
 
@@ -80,10 +79,9 @@ namespace AndroidSettings {
                                                          Settings::Specialization::Paired, true,
                                                          true};
         Settings::Setting<bool> perf_overlay_background{linkage, false, "perf_overlay_background",
-                                                        Settings::Category::Overlay,
-                                                        Settings::Specialization::Default, true,
-                                                        true,
-                                                        &show_performance_overlay};
+                                                   Settings::Category::Overlay,
+                                                   Settings::Specialization::Default, true, true,
+                                                   &show_performance_overlay};
         Settings::Setting<s32> perf_overlay_position{linkage, 0, "perf_overlay_position",
                                                      Settings::Category::Overlay,
                                                      Settings::Specialization::Default, true, true,
@@ -109,23 +107,10 @@ namespace AndroidSettings {
                                                      Settings::Category::Overlay,
                                                      Settings::Specialization::Default, true, true,
                                                      &show_performance_overlay};
-        Settings::Setting<Settings::TemperatureUnits> bat_temperature_unit{linkage,
-                                                                           Settings::TemperatureUnits::Celsius,
-                                                                           "bat_temperature_unit",
-                                                                           Settings::Category::Overlay,
-                                                                           Settings::Specialization::Default,
-                                                                           true, true,
-                                                                           &show_bat_temperature};
-        Settings::Setting<bool> show_power_info{linkage, false, "show_power_info",
-                                                Settings::Category::Overlay,
-                                                Settings::Specialization::Default, true, true,
-                                                &show_performance_overlay};
         Settings::Setting<bool> show_shaders_building{linkage, true, "show_shaders_building",
                                                       Settings::Category::Overlay,
                                                       Settings::Specialization::Default, true, true,
                                                       &show_performance_overlay};
-
-
         Settings::Setting<bool> show_input_overlay{linkage, true, "show_input_overlay",
                                                    Settings::Category::Overlay};
         Settings::Setting<bool> touchscreen{linkage, true, "touchscreen",
@@ -140,14 +125,14 @@ namespace AndroidSettings {
                                                  Settings::Specialization::Paired, true, true};
 
         Settings::Setting<bool> show_device_model{linkage, true, "show_device_model",
-                                                  Settings::Category::Overlay,
-                                                  Settings::Specialization::Default, true, true,
-                                                  &show_performance_overlay};
+                                                      Settings::Category::Overlay,
+                                                      Settings::Specialization::Default, true, true,
+                                                      &show_soc_overlay};
 
         Settings::Setting<bool> show_gpu_model{linkage, true, "show_gpu_model",
-                                               Settings::Category::Overlay,
-                                               Settings::Specialization::Default, true, true,
-                                               &show_performance_overlay};
+                                                      Settings::Category::Overlay,
+                                                      Settings::Specialization::Default, true, true,
+                                                      &show_soc_overlay};
 
         Settings::Setting<bool> show_soc_model{linkage, true, "show_soc_model",
                                                Settings::Category::Overlay,
@@ -155,19 +140,18 @@ namespace AndroidSettings {
                                                &show_soc_overlay};
 
         Settings::Setting<bool> show_fw_version{linkage, true, "show_firmware_version",
-                                                Settings::Category::Overlay,
-                                                Settings::Specialization::Default, true, true,
-                                                &show_performance_overlay};
+                                               Settings::Category::Overlay,
+                                               Settings::Specialization::Default, true, true,
+                                               &show_soc_overlay};
 
         Settings::Setting<bool> soc_overlay_background{linkage, false, "soc_overlay_background",
-                                                       Settings::Category::Overlay,
-                                                       Settings::Specialization::Default, true,
-                                                       true,
-                                                       &show_soc_overlay};
+                                                        Settings::Category::Overlay,
+                                                        Settings::Specialization::Default, true, true,
+                                                        &show_soc_overlay};
         Settings::Setting<s32> soc_overlay_position{linkage, 2, "soc_overlay_position",
-                                                    Settings::Category::Overlay,
-                                                    Settings::Specialization::Default, true, true,
-                                                    &show_soc_overlay};
+                                                     Settings::Category::Overlay,
+                                                     Settings::Specialization::Default, true, true,
+                                                     &show_soc_overlay};
 
         Settings::Setting<bool> dont_show_eden_veil_warning{linkage, false,
                                                             "dont_show_eden_veil_warning",
diff --git a/src/android/app/src/main/res/values-sr/strings.xml b/src/android/app/src/main/res/values-sr/strings.xml
index d0cb8d5d14..814466a707 100644
--- a/src/android/app/src/main/res/values-sr/strings.xml
+++ b/src/android/app/src/main/res/values-sr/strings.xml
@@ -14,8 +14,6 @@
     <string name="shaders_prefix">Зграда</string>
     <string name="shaders_suffix">Схадер (с)</string>
     <string name="system_info_label">Систем:</string>
-    <string name="charging">(Пуњење)</string>
-
     <string name="show_stats_overlay">Покажи Статистика перформанси Статистика</string>
     <string name="stats_overlay_customization">Прилагођавање</string>
     <string name="stats_overlay_items">Видљивост</string>
@@ -33,10 +31,7 @@
     <string name="show_system_ram_usage">Прикажи употребу система меморије</string>
     <string name="show_system_ram_usage_description">Прикажите износ РАМ-а који користи систем</string>
     <string name="show_bat_temperature">Прикажи температуру батерије</string>
-    <string name="show_bat_temperature_description">Прикажи тренутну температуру батерије</string>
-    <string name="bat_temperature_unit">Јединице за температуру батерије</string>
-    <string name="show_power_info">Прикажи информације о батерији</string>
-    <string name="show_power_info_description">Приказ тренутне потрошње енергије и преостали капацитет батерије</string>
+    <string name="show_bat_temperature_description">Прикажи тренутну температуру батерије у Целзијусу и Фахренхеиту</string>
     <string name="show_shaders_building">Прикажи Схадерс Буилдинг</string>
     <string name="show_shaders_building_description">Прикажи тренутни број саграђених Схадера</string>
     <string name="overlay_position">Положај прекривања</string>
@@ -103,11 +98,11 @@
     <string name="memory_layout">Изглед меморије</string>
     <string name="memory_layout_description">(Експериментално) Промените изглед емулираног меморије. Ово постављање неће повећати перформансе, али може помоћи у играма које користе високе резолуције путем модова. Не користите на телефонима са 8 ГБ РАМ-а или мање. Ради само на динамичком (ЈИТ) бацкенд-у.</string>
 
-    <string name="sample_shading">Семпловање сенчења</string>
-    <string name="sample_shading_description">Омогућава фрагмент шејдеру да се извршава по узорку у вишеузорачном фрагменту уместо једном по фрагменту. Побољшава квалитет графике на рачун перформанси. Само Vulkan 1.1+ уређаји подржавају ову екстензију.</string>
-    <string name="custom_cpu_ticks">Прилагођени CPU тактови</string>
-    <string name="custom_cpu_ticks_description">Поставите прилагођену вредност CPU тактова. Веће вредности могу повећати перформансе, али могу изазвати залеђивање игре. Препоручује се опсег 77–21000.</string>
-    <string name="cpu_ticks">Тактови</string>
+  <string name="sample_shading">Семпловање сенчења</string>
+  <string name="sample_shading_description">Омогућава фрагмент шејдеру да се извршава по узорку у вишеузорачном фрагменту уместо једном по фрагменту. Побољшава квалитет графике на рачун перформанси. Само Vulkan 1.1+ уређаји подржавају ову екстензију.</string>
+  <string name="custom_cpu_ticks">Прилагођени CPU тактови</string>
+  <string name="custom_cpu_ticks_description">Поставите прилагођену вредност CPU тактова. Веће вредности могу повећати перформансе, али могу изазвати залеђивање игре. Препоручује се опсег 77–21000.</string>
+  <string name="cpu_ticks">Тактови</string>
 
     <!-- Shader Backend -->
     <string name="shader_backend">Схадер Бацкенд</string>
@@ -210,23 +205,23 @@
     <string name="multiplayer_no_game">Није пронађена није пронађена игара</string>
     <string name="multiplayer_preferred_game_name_invalid">Морате одабрати преферирану игру да бисте угостили собу.</string>
     <string name="multiplayer_token_error">Мора бити дугачко 48 знакова и садржати само мала слова a-z</string>
-    <string name="multiplayer_lobby_type">Тип лобија</string>
-    <string name="multiplayer_public_visibility">Јавно</string>
-    <string name="multiplayer_unlisted_visibility">Неприказано</string>
-    <string name="multiplayer_name_invalid">Име је прекратко</string>
-    <string name="multiplayer_address_invalid">Неисправна адреса</string>
-    <string name="multiplayer_username_error">Мора бити између 4–20 знакова</string>
+  <string name="multiplayer_lobby_type">Тип лобија</string>
+  <string name="multiplayer_public_visibility">Јавно</string>
+  <string name="multiplayer_unlisted_visibility">Неприказано</string>
+  <string name="multiplayer_name_invalid">Име је прекратко</string>
+  <string name="multiplayer_address_invalid">Неисправна адреса</string>
+  <string name="multiplayer_username_error">Мора бити између 4–20 знакова</string>
     <string name="cancel">Отказати</string>
     <string name="ok">У реду</string>
     <string name="refresh">Освежити</string>
     <string name="room_list">Листа соба</string>
     <string name="multiplayer_joining">Придружујем се…</string>
-    <string name="multiplayer_creating">Креирам…</string>
-    <string name="multiplayer_required">Обавезно</string>
-    <string name="multiplayer_token_required">Потребан је веб токен, идите на Напредне поставке -> Систем -> Мрежа</string>
-    <string name="multiplayer_ip_error">Неисправан ИП формат</string>
-    <string name="multiplayer_port_error">Мора бити између 1 и 65535</string>
-    <string name="multiplayer_room_name_error">Мора бити између 3 и 20 знакова</string>
+  <string name="multiplayer_creating">Креирам…</string>
+  <string name="multiplayer_required">Обавезно</string>
+  <string name="multiplayer_token_required">Потребан је веб токен, идите на Напредне поставке -> Систем -> Мрежа</string>
+  <string name="multiplayer_ip_error">Неисправан ИП формат</string>
+  <string name="multiplayer_port_error">Мора бити између 1 и 65535</string>
+  <string name="multiplayer_room_name_error">Мора бити између 3 и 20 знакова</string>
 
     <!-- Setup strings -->
     <string name="welcome">Добродошли!</string>
@@ -433,16 +428,16 @@
 
     <!-- Network settings strings -->
     <string name="generate">Генериши</string>
-    <string name="web_username">Веб корисничко име</string>
-    <string name="web_username_description">Корисничко име које ће бити приказано у мултиплејер лобијима. Мора бити дугачко 4–20 знакова.</string>
+  <string name="web_username">Веб корисничко име</string>
+  <string name="web_username_description">Корисничко име које ће бити приказано у мултиплејер лобијима. Мора бити дугачко 4–20 знакова.</string>
     <string name="web_token">Веб токен</string>
     <string name="web_token_description">Веб токен који се користи за стварање јавних лобија. То је низ од 48 знакова који садржи само мала слова А-З.</string>
     <string name="network">Мрежа</string>
 
     <!-- Graphics settings strings -->
     <string name="backend">Бекенд</string>
-    <string name="display">Приказ</string>
-    <string name="processing">Постпроцесирање</string>
+  <string name="display">Приказ</string>
+  <string name="processing">Постпроцесирање</string>
     <string name="frame_skipping">ВИП: Фрамескип</string>
     <string name="frame_skipping_description">Пребацивање оквира прескакање да бисте побољшали перформансе смањењем броја пружених оквира. Ова функција се и даље ради и биће омогућена у будућим издањима.</string>
     <string name="renderer_accuracy">Ниво тачности</string>
@@ -796,10 +791,6 @@
     <string name="gpu_medium">Средња (256)</string>
     <string name="gpu_high">Висок (512)</string>
 
-    <!-- Temperature Units -->
-    <string name="temperature_celsius">Целзијус</string>
-    <string name="temperature_fahrenheit">Фаренхајт</string>
-
     <!-- Language Names -->
     <string name="language_japanese" translatable="false">日本語</string>
     <string name="language_english" translatable="false">English</string>
@@ -988,8 +979,8 @@
 
     <string name="swkbd_applet">Софтверска тастатура</string>
 
-    <string name="airplane_mode">Авионски режим</string>
-    <string name="airplane_mode_description">Прослеђује авионски режим на Switch OS</string>
+  <string name="airplane_mode">Авионски режим</string>
+  <string name="airplane_mode_description">Прослеђује авионски режим на Switch OS</string>
 
     <!-- Licenses screen strings -->
     <string name="licenses">Лиценце</string>
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 42dcfbc68b..23514a0a23 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -471,14 +471,4 @@
         <item>1</item>
         <item>2</item>
     </integer-array>
-
-    <string-array name="temperatureUnitEntries">
-        <item>@string/temperature_celsius</item>
-        <item>@string/temperature_fahrenheit</item>
-    </string-array>
-
-    <integer-array name="temperatureUnitValues">
-        <item>0</item>
-        <item>1</item>
-    </integer-array>
 </resources>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 6f446758b5..454e633cc3 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -14,8 +14,6 @@
     <string name="process_ram">Process RAM: %1$d MB</string>
     <string name="shaders_prefix">Building</string>
     <string name="shaders_suffix">Shader(s)</string>
-    <string name="charging">(Charging)</string>
-
     <string name="system_info_label">System:</string>
     <string name="show_stats_overlay">Show Performance Stats Overlay</string>
     <string name="stats_overlay_customization">Customization</string>
@@ -34,10 +32,7 @@
     <string name="show_system_ram_usage">Show System Memory Usage</string>
     <string name="show_system_ram_usage_description">Display the amount of RAM used by the system</string>
     <string name="show_bat_temperature">Show Battery Temperature</string>
-    <string name="show_bat_temperature_description">Display current battery temperature</string>
-    <string name="bat_temperature_unit">Battery Temperature Units</string>
-    <string name="show_power_info">Show Battery Info</string>
-    <string name="show_power_info_description">Display current power draw and remaining capacity on battery</string>
+    <string name="show_bat_temperature_description">Display current Battery temperature in Celsius and Fahrenheit</string>
     <string name="show_shaders_building">Show Shaders Building</string>
     <string name="show_shaders_building_description">Display current number of shaders being built</string>
     <string name="overlay_position">Overlay Position</string>
@@ -104,8 +99,6 @@
     <string name="custom_cpu_ticks">Custom CPU Ticks</string>
     <string name="custom_cpu_ticks_description">Set a custom value of CPU ticks. Higher values can increase performance, but may also cause the game to freeze. A range of 77–21000 is recommended.</string>
     <string name="cpu_ticks">Ticks</string>
-    <string name="skip_cpu_inner_invalidation">Skip CPU Inner Invalidation</string>
-    <string name="skip_cpu_inner_invalidation_description">Skips certain CPU-side cache invalidations during memory updates, reducing CPU usage and improving it's performance. This may cause glitches or crashes on some games.</string>
     <string name="fast_cpu_time">CPU Clock</string>
     <string name="fast_cpu_time_description">Use Boost (1700MHz) to run at the Switch\'s highest native clock, or Fast (2000MHz) to run at 2x clock.</string>
     <string name="memory_layout">Memory Layout</string>
@@ -825,10 +818,6 @@
     <string name="gpu_medium">Medium (256)</string>
     <string name="gpu_high">High (512)</string>
 
-    <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
-
     <!-- Language Names -->
     <string name="language_japanese" translatable="false">日本語</string>
     <string name="language_english" translatable="false">English</string>
diff --git a/src/common/settings.h b/src/common/settings.h
index 941a4513e6..2d5a1c4736 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -450,13 +450,6 @@ struct Values {
                                                            VramUsageMode::Aggressive,
                                                            "vram_usage_mode",
                                                            Category::RendererAdvanced};
-    SwitchableSetting<bool> skip_cpu_inner_invalidation{linkage,
-                                                        true,
-                                                        "skip_cpu_inner_invalidation",
-                                                        Category::RendererAdvanced,
-                                                        Specialization::Default,
-                                                        true,
-                                                        true};
     SwitchableSetting<bool> async_presentation{linkage,
 #ifdef ANDROID
                                                true,
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index c2347f74d0..f0c5c96cc4 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -178,8 +178,6 @@ ENUM(SpirvOptimizeMode, Never, OnLoad, Always);
 
 ENUM(GpuOverclock, Low, Medium, High)
 
-ENUM(TemperatureUnits, Celsius, Fahrenheit)
-
 template <typename Type>
 inline std::string CanonicalizeEnum(Type id) {
     const auto group = EnumMetadata<Type>::Canonicalizations();
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h
index 481efbf53b..6e2eccfbf0 100644
--- a/src/video_core/rasterizer_interface.h
+++ b/src/video_core/rasterizer_interface.h
@@ -9,7 +9,6 @@
 #include <utility>
 #include "common/common_types.h"
 #include "common/polyfill_thread.h"
-#include "common/settings.h"
 #include "video_core/cache_types.h"
 #include "video_core/engines/fermi_2d.h"
 #include "video_core/gpu.h"
@@ -101,10 +100,8 @@ public:
                                   VideoCommon::CacheType which = VideoCommon::CacheType::All) = 0;
 
     virtual void InnerInvalidation(std::span<const std::pair<DAddr, std::size_t>> sequences) {
-        if (!Settings::values.skip_cpu_inner_invalidation.GetValue()) {
-            for (const auto& [cpu_addr, size] : sequences) {
-                InvalidateRegion(cpu_addr, size);
-            }
+        for (const auto& [cpu_addr, size] : sequences) {
+            InvalidateRegion(cpu_addr, size);
         }
     }
 
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index c743e65ae3..2ff2626b6c 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -250,11 +250,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent)
               "of available video memory for performance. Has no effect on integrated graphics. "
               "Aggressive mode may severely impact the performance of other applications such as "
               "recording software."));
-    INSERT(Settings,
-           skip_cpu_inner_invalidation,
-           tr("Skip CPU Inner Invalidation"),
-           tr("Skips certain CPU-side cache invalidations during memory updates, reducing CPU usage and "
-              "improving it's performance. This may cause glitches or crashes on some games."));
     INSERT(
         Settings,
         vsync_mode,