diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java
index 2771538ff..bcd2e41b3 100644
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -4,7 +4,6 @@ import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
 
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -22,14 +21,12 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import app.organicmaps.downloader.DownloaderActivity;
 import app.organicmaps.intent.Factory;
-import app.organicmaps.sdk.display.DisplayManager;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.util.SharingUtils;
-import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.Utils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.io.IOException;
diff --git a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
index 5da04b826..0db596808 100644
--- a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
+++ b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
@@ -17,7 +17,7 @@ import androidx.annotation.NonNull;
 import androidx.documentfile.provider.DocumentFile;
 import app.organicmaps.R;
 import app.organicmaps.sdk.util.log.Logger;
-import app.organicmaps.util.UiUtils;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
diff --git a/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java b/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java
index cce0d4b84..ffa01e0f9 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java
@@ -8,7 +8,6 @@ import androidx.car.app.CarContext;
 import androidx.car.app.model.CarIcon;
 import androidx.car.app.navigation.model.Destination;
 import androidx.car.app.navigation.model.Lane;
-import androidx.car.app.navigation.model.LaneDirection;
 import androidx.car.app.navigation.model.Step;
 import androidx.car.app.navigation.model.TravelEstimate;
 import androidx.car.app.navigation.model.Trip;
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
index e96b86338..b4587bb1d 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -382,10 +382,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         else
           processLongClick();
       }
-      case CountryItem.STATUS_FAILED ->
-      {
-        MapManagerHelper.warn3gAndRetry(mActivity, mItem.id, null);
-      }
+      case CountryItem.STATUS_FAILED -> MapManagerHelper.warn3gAndRetry(mActivity, mItem.id, null);
       case CountryItem.STATUS_UPDATABLE ->
         MapManagerHelper.warnOn3gUpdate(mActivity, mItem.id, () -> MapManagerHelper.startUpdate(mItem.id));
       default -> throw new IllegalArgumentException("Inappropriate item status: " + mItem.status);
diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
index d6d3f2867..ebcee31da 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
@@ -66,12 +66,9 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
     case TYPE_FOOTER ->
     {
       return new FooterViewHolder(inflater.inflate(R.layout.item_feature_category_footer, parent, false),
-                                  (FooterListener) mFragment);
-    }
-    default ->
-    {
-      throw new IllegalArgumentException("Unsupported viewType: " + viewType);
+              mFragment);
     }
+    default -> throw new IllegalArgumentException("Unsupported viewType: " + viewType);
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
index e52abfc43..d30ac500a 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
@@ -4,7 +4,6 @@ import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,7 +14,6 @@ import androidx.annotation.Nullable;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
-import app.organicmaps.dialog.EditTextDialogFragment;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.OsmOAuth;
diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
index c66075277..bb1ab5d57 100644
--- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
@@ -17,7 +17,6 @@ import app.organicmaps.BuildConfig;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.sdk.Framework;
-import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.Constants;
 import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.util.Graphics;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
index 02ed48520..28e760076 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -38,7 +38,6 @@ import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
-import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.menu.MyPositionButton;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
index e3a6bea9a..7ca7e557f 100644
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -31,7 +31,6 @@ import app.organicmaps.widget.LanesView;
 import app.organicmaps.widget.SpeedLimitView;
 import app.organicmaps.widget.menu.NavMenu;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
 
 public class NavigationController implements TrafficManager.TrafficCallback, NavMenu.NavMenuListener
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
index 66c4f5bc1..510890071 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
@@ -16,7 +16,6 @@ import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
 import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.sdk.downloader.CountryItem;
-import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.util.UiUtils;
 import com.google.android.material.textview.MaterialTextView;
 
diff --git a/android/app/src/main/java/app/organicmaps/search/TabAdapter.java b/android/app/src/main/java/app/organicmaps/search/TabAdapter.java
index 314fad9c9..b5c1ff03f 100644
--- a/android/app/src/main/java/app/organicmaps/search/TabAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/TabAdapter.java
@@ -150,7 +150,7 @@ class TabAdapter extends FragmentPagerAdapter
 
     ViewPager.OnPageChangeListener listener = new PageChangedListener(tabs);
     mPager.addOnPageChangeListener(listener);
-    tabs.setOnTabSelectedListener(new OnTabSelectedListenerForViewPager(mPager));
+    tabs.addOnTabSelectedListener(new OnTabSelectedListenerForViewPager(mPager));
     SharedPreferences preferences = MwmApplication.prefs(mPager.getContext());
     int lastSelectedTabPosition = preferences.getInt(Config.KEY_PREF_LAST_SEARCHED_TAB, 0);
     listener.onPageSelected(lastSelectedTabPosition);
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
index a5e7cded0..4f31f2739 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
@@ -3,10 +3,9 @@ package app.organicmaps.widget.placepage;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
-import app.organicmaps.sdk.bookmarks.data.Bookmark;
-import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
+
 import app.organicmaps.sdk.bookmarks.data.MapObject;
-import app.organicmaps.sdk.bookmarks.data.Track;
+
 import java.util.List;
 
 public class PlacePageViewModel extends ViewModel
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
index 528d2fb82..d0bd46ec7 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
@@ -3,7 +3,7 @@ package app.organicmaps.sdk.editor;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.sdk.editor.OhState;
+
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
 
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
index 53a7b9446..3ed242cff 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
@@ -3,7 +3,6 @@ package app.organicmaps.sdk.maplayer;
 import android.content.Context;
 import androidx.annotation.NonNull;
 import app.organicmaps.sdk.Framework;
-import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
index 90b665ee2..a28011189 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
@@ -5,5 +5,5 @@ public enum IsolinesState
   DISABLED,
   ENABLED,
   EXPIREDDATA,
-  NODATA;
+  NODATA
 }
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
index a954f169b..c59a4de31 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import androidx.annotation.NonNull;
-import app.organicmaps.sdk.R;
 
 public final class Config
 {
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
index 6b37f58d4..6778d4c2c 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
@@ -131,12 +131,12 @@ public final class Logger
 
       final String threadName = "(" + Thread.currentThread().getName() + ") ";
       if (logsFolder == null || BuildConfig.DEBUG)
-        Log.println(level, tag, threadName + sb.toString());
+        Log.println(level, tag, threadName + sb);
 
       if (logsFolder != null)
       {
         sb.insert(0, String.valueOf(getLevelChar(level)) + '/' + tag + ": ");
-        LogsManager.EXECUTOR.execute(new WriteTask(logsFolder + File.separator + FILENAME, threadName + sb.toString()));
+        LogsManager.EXECUTOR.execute(new WriteTask(logsFolder + File.separator + FILENAME, threadName + sb));
       }
     }
   }