diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index 262bdbb65f..083e0054ad 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -475,21 +475,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
-//  @Override
-//  @StyleRes
-//  protected int getThemeResourceId(@NonNull String theme)
-//  {
-//    Context context = getApplicationContext();
-//
-//    if (ThemeUtils.isDefaultTheme(context, theme))
-//      return R.style.MwmTheme_MainActivity;
-//
-//    if (ThemeUtils.isNightTheme(context, theme))
-//      return R.style.MwmTheme_Night_MainActivity;
-//
-//    return super.getThemeResourceId(theme);
-//  }
-
   @Override
   public void onDisplayChangedToCar(@NonNull Runnable onTaskFinishedCallback)
   {
diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
index 9292686a99..60c004565b 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
@@ -51,7 +51,6 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
   {
     super.onCreate(savedInstanceState);
     mThemeName = Config.getThemeSettings(getApplicationContext());
-    //setTheme(getThemeResourceId(mThemeName));
     EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
     RtlUtils.manageRtl(this);
     if (!MwmApplication.from(this).arePlatformAndCoreInitialized())
@@ -112,6 +111,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
     super.onPostResume();
     if (!mThemeName.equals(Config.getThemeSettings(getApplicationContext())))
     {
+      // TODO: is this still needed?
       // Workaround described in https://code.google.com/p/android/issues/detail?id=93731
       UiThread.runLater(this::recreate);
     }