diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index c101917cb..0ba3f0077 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -48,7 +48,6 @@ import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index 8707568c2..b2afed912 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -547,7 +547,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
                   updateChargeSockets(socketIndex, socket);
                 })
-        .setNegativeButton(R.string.cancel, (dialog, which) -> { dialog.dismiss(); });
+        .setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
   }
 
   // Helper method for validation logic
@@ -643,17 +643,13 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
         count.setText(getString(R.string.count_label, socket.count()));
       }
 
-      itemView.setOnClickListener(v -> {
-        buildChargeSocketDialog(currentIndex, socket.type(), socket.count(), socket.power()).show();
-      });
+      itemView.setOnClickListener(v -> buildChargeSocketDialog(currentIndex, socket.type(), socket.count(), socket.power()).show());
       socketsGrid.addView(itemView);
     }
 
     // add a 'new item' button at the end, to create new sockets
     View btnNewItemView = inflater.inflate(R.layout.button_new_item, socketsGrid, false);
-    btnNewItemView.setOnClickListener(v -> {
-      buildChargeSocketDialog(-1, "unknown", -1, -1).show();
-    });
+    btnNewItemView.setOnClickListener(v -> buildChargeSocketDialog(-1, "unknown", -1, -1).show());
     socketsGrid.addView(btnNewItemView);
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
index 1114b96ec..e20136328 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
@@ -2,14 +2,12 @@ package app.organicmaps.maplayer;
 
 import android.content.Context;
 import android.view.View;
-import androidx.annotation.AttrRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import app.organicmaps.R;
 import app.organicmaps.adapter.OnItemClickListener;
 import app.organicmaps.sdk.maplayer.Mode;
-import app.organicmaps.util.ThemeUtils;
 
 public class LayerBottomSheetItem
 {
@@ -37,27 +35,25 @@ public class LayerBottomSheetItem
     @DrawableRes
     int drawableResId = 0;
     @StringRes
-    int buttonTextResource = R.string.layers_title;
-    switch (mode)
-    {
-    case OUTDOORS:
-      drawableResId = R.drawable.ic_layers_outdoors;
-      buttonTextResource = R.string.button_layer_outdoor;
-      break;
-    case SUBWAY:
-      drawableResId = R.drawable.ic_layers_subway;
-      buttonTextResource = R.string.subway;
-      break;
-    case ISOLINES:
-      drawableResId = R.drawable.ic_layers_isoline;
-      buttonTextResource = R.string.button_layer_isolines;
-      break;
-    case TRAFFIC:
-      drawableResId = R.drawable.ic_layers_traffic;
-      buttonTextResource = R.string.button_layer_traffic;
-      break;
-    }
-    return new LayerBottomSheetItem(drawableResId, buttonTextResource, mode, layerItemClickListener);
+    int buttonTextResource = switch (mode) {
+        case OUTDOORS -> {
+            drawableResId = R.drawable.ic_layers_outdoors;
+            yield R.string.button_layer_outdoor;
+        }
+        case SUBWAY -> {
+            drawableResId = R.drawable.ic_layers_subway;
+            yield R.string.subway;
+        }
+        case ISOLINES -> {
+            drawableResId = R.drawable.ic_layers_isoline;
+            yield R.string.button_layer_isolines;
+        }
+        case TRAFFIC -> {
+            drawableResId = R.drawable.ic_layers_traffic;
+            yield R.string.button_layer_traffic;
+        }
+    };
+      return new LayerBottomSheetItem(drawableResId, buttonTextResource, mode, layerItemClickListener);
   }
 
   @NonNull
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchActivity.java b/android/app/src/main/java/app/organicmaps/search/SearchActivity.java
index 8b6426278..cfd4bf336 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchActivity.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchActivity.java
@@ -5,10 +5,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
 import androidx.fragment.app.Fragment;
 import app.organicmaps.base.BaseMwmFragmentActivity;
-import app.organicmaps.util.ThemeUtils;
 
 public class SearchActivity extends BaseMwmFragmentActivity
 {
diff --git a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
index 09b6a502b..6e3924460 100644
--- a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
@@ -3,7 +3,6 @@ package app.organicmaps.widget;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java b/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
index 3e1744a95..2ac351d08 100644
--- a/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
@@ -7,7 +7,6 @@ import androidx.annotation.DrawableRes;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatRadioButton;
 import app.organicmaps.R;
-import app.organicmaps.util.ThemeUtils;
 
 public class RoutingToolbarButton extends AppCompatRadioButton
 {
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index fb1b6f4a8..7d76e112b 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -32,7 +32,6 @@ import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
-import app.organicmaps.BuildConfig;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
@@ -57,7 +56,6 @@ import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.OhState;
 import app.organicmaps.sdk.editor.OpeningHours;
-import app.organicmaps.sdk.editor.data.HoursMinutes;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.location.SensorListener;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageChargeSocketsFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageChargeSocketsFragment.java
index 8233cb6e3..8be5615d2 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageChargeSocketsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageChargeSocketsFragment.java
@@ -8,8 +8,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.GridLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -23,7 +21,6 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.ChargeSocketDescriptor;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
-import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
 import java.text.DecimalFormat;
 
diff --git a/android/app/src/main/res/layout-land/fragment_osm_login.xml b/android/app/src/main/res/layout-land/fragment_osm_login.xml
index bd0a2a606..5cf162618 100644
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -16,8 +16,7 @@
     android:background="?cardBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
-    android:clipToPadding="false"
-    tools:ignore="DuplicateIds">
+    android:clipToPadding="false">
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent"
@@ -36,7 +35,6 @@
           android:orientation="vertical"
           android:padding="@dimen/margin_base">
           <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/textView2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_half"
diff --git a/android/app/src/main/res/layout/fragment_editor.xml b/android/app/src/main/res/layout/fragment_editor.xml
index e752a25c9..ac658a704 100644
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -6,8 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    tools:context=".editor.EditorActivity"
-    tools:ignore="DuplicateIds">
+    tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index 1fe58c9f6..69cc6c800 100644
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -16,8 +16,7 @@
     android:background="?cardBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
-    android:clipToPadding="false"
-    tools:ignore="DuplicateIds">
+    android:clipToPadding="false">
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent"
@@ -27,7 +26,6 @@
       android:padding="@dimen/margin_base"
       tools:ignore="ScrollViewSize">
       <com.google.android.material.textview.MaterialTextView
-          android:id="@+id/textView2"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_marginBottom="@dimen/margin_half"
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ChargeSocketDescriptor.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ChargeSocketDescriptor.java
index 743c39afc..af388b5cf 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ChargeSocketDescriptor.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ChargeSocketDescriptor.java
@@ -1,7 +1,5 @@
 package app.organicmaps.sdk.bookmarks.data;
 
-import java.text.DecimalFormat;
-
 /**
  * represents the details of the socket available on a particular charging station
  *
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
index dd9b3fcb0..ab758465e 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
@@ -16,7 +16,7 @@ public class PredefinedColors
   public @interface Color
   {}
 
-  /// @note Color format: ARGB
+  /// note Color format: ARGB
   @ColorInt
   private static final int[] PREDEFINED_COLORS = nativeGetPredefinedColors();
 
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
index 6e582bd9c..dbb8a4604 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
@@ -13,19 +13,6 @@ public final class OsmOAuth
 {
   private OsmOAuth() {}
 
-  public enum AuthType
-  {
-    OSM("OSM"),
-    GOOGLE("Google");
-
-    public final String name;
-
-    AuthType(String name)
-    {
-      this.name = name;
-    }
-  }
-
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull
   private static SharedPreferences mPrefs;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
index 635af7610..3b3d90ab0 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
@@ -32,7 +32,6 @@ public final class Constants
     public static final String OPENING_HOURS_MANUAL = "file:///android_asset/opening_hours_how_to_edit.html";
 
     public static final String OSM_REGISTER = "https://www.openstreetmap.org/user/new";
-    public static final String OSM_RECOVER_PASSWORD = "https://www.openstreetmap.org/user/forgot-password";
 
     private Url() {}
   }
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
index bb1b4ee39..8a649bd91 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
@@ -33,7 +33,7 @@ public final class Distance
     }
   }
 
-  /// @todo What is the difference with cpp: kNarrowNonBreakingSpace = "\u202F" ?
+  /// todo What is the difference with cpp: kNarrowNonBreakingSpace = "\u202F" ?
   private static final char NON_BREAKING_SPACE = '\u00A0';
 
   public final double mDistance;