diff --git a/android/app/src/main/java/app/organicmaps/ChartController.java b/android/app/src/main/java/app/organicmaps/ChartController.java
index 7d64e44a6b..9e89ffb8ca 100644
--- a/android/app/src/main/java/app/organicmaps/ChartController.java
+++ b/android/app/src/main/java/app/organicmaps/ChartController.java
@@ -7,7 +7,6 @@ import android.view.View;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
 import com.github.mikephil.charting.charts.LineChart;
@@ -34,7 +33,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
 public class ChartController implements OnChartValueSelectedListener,
                                         BookmarkManager.OnElevationActivePointChangedListener,
diff --git a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
index c27dcc89e9..6b473deb62 100644
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.location.Location;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
diff --git a/android/app/src/main/java/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java
index c3ef9c7930..972ef3cad8 100644
--- a/android/app/src/main/java/app/organicmaps/MapFragment.java
+++ b/android/app/src/main/java/app/organicmaps/MapFragment.java
@@ -16,7 +16,6 @@ import androidx.annotation.Nullable;
 import androidx.core.content.res.ConfigurationHelper;
 
 import app.organicmaps.base.BaseMwmFragment;
-import app.organicmaps.display.DisplayManager;
 import app.organicmaps.display.DisplayType;
 import app.organicmaps.util.log.Logger;
 
diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragment.java
index 9f6efcbcd6..953f0ecfdf 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragment.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragment.java
@@ -5,7 +5,6 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 
 import app.organicmaps.util.Utils;
 
diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmToolbarFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmToolbarFragment.java
index fd22f57f39..cca3723583 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmToolbarFragment.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmToolbarFragment.java
@@ -5,12 +5,7 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentManager;
 
-import app.organicmaps.R;
-import app.organicmaps.dialog.ProgressDialogFragment;
 import app.organicmaps.widget.ToolbarController;
 
 public class BaseMwmToolbarFragment extends BaseMwmFragment
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
index 9ef5600fef..bcae4ec254 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.location.Location;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
index 6a3fe823af..5db49e6c50 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -10,7 +10,6 @@ import android.widget.RadioGroup;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
 import app.organicmaps.R;
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java
index 9c7e5bdf0b..5f266f343e 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java
@@ -5,7 +5,6 @@ import android.os.Parcelable;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
-import androidx.annotation.PluralsRes;
 import androidx.annotation.StringRes;
 
 import app.organicmaps.R;
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java
index 43ae9ee395..3fed08b56c 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java
@@ -13,7 +13,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 import app.organicmaps.Framework;
 import app.organicmaps.bookmarks.DataChangedListener;
-import app.organicmaps.bookmarks.BookmarkCategoriesFragment;
 import app.organicmaps.util.KeyValue;
 import app.organicmaps.util.StorageUtils;
 import app.organicmaps.util.concurrency.UiThread;
diff --git a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
index 92bbb7aed1..4148c38b0e 100644
--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -1,6 +1,5 @@
 package app.organicmaps.editor;
 
-import android.graphics.Color;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
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 4061e4103a..b3672afa31 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -21,7 +21,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.SwitchCompat;
-import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -36,12 +35,10 @@ import app.organicmaps.editor.data.LocalizedName;
 import app.organicmaps.editor.data.LocalizedStreet;
 import app.organicmaps.editor.data.TimeFormatUtils;
 import app.organicmaps.editor.data.Timetable;
-import app.organicmaps.util.Constants;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
 import app.organicmaps.util.Option;
 import app.organicmaps.util.StringUtils;
-import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
index 89a6b0b652..da5d42320c 100644
--- a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
@@ -14,7 +14,6 @@ import androidx.annotation.Nullable;
 
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
-import app.organicmaps.util.Constants;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.concurrency.ThreadPool;
 import app.organicmaps.util.concurrency.UiThread;
diff --git a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
index ca99dfcd68..d061dd58ef 100644
--- a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
@@ -17,7 +17,6 @@ import androidx.fragment.app.FragmentActivity;
 
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
-import app.organicmaps.base.OnBackPressListener;
 import app.organicmaps.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
index debd29e910..9adbf582a2 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
@@ -3,7 +3,6 @@ package app.organicmaps.maplayer;
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
 import android.content.Context;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.View;
@@ -21,7 +20,6 @@ import app.organicmaps.search.SearchEngine;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.UiUtils;
-import app.organicmaps.util.Utils;
 import app.organicmaps.util.concurrency.UiThread;
 
 public class SearchWheel implements View.OnClickListener
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java b/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java
index b6a98b8691..06f3651e47 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java
@@ -4,7 +4,6 @@ import android.app.Application;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import app.organicmaps.Framework;
 import app.organicmaps.MwmApplication;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java b/android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java
index 8755d21214..3555bf3a58 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java
@@ -4,7 +4,6 @@ import android.app.Application;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import app.organicmaps.Framework;
 import app.organicmaps.MwmApplication;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java
index 8e96d7c94f..82ee6ed556 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java
@@ -2,7 +2,6 @@ package app.organicmaps.maplayer.traffic;
 
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import app.organicmaps.util.log.Logger;
 
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
index 0c0ac00dc4..a0e4868cc5 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -41,7 +41,6 @@ import app.organicmaps.widget.recycler.MultilineLayoutManager;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 
 final class RoutingBottomMenuController implements View.OnClickListener
 {
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java
index bfb3e119d2..4a39a556fd 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java
@@ -12,7 +12,6 @@ import androidx.fragment.app.FragmentActivity;
 import app.organicmaps.Framework;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
-import app.organicmaps.base.OnBackPressListener;
 
 public class RoutingPlanFragment extends BaseMwmFragment
 {
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
index b25262c760..29ad8b14dd 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
@@ -27,7 +27,6 @@ import app.organicmaps.Framework;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
-import app.organicmaps.base.OnBackPressListener;
 import app.organicmaps.bookmarks.data.FeatureId;
 import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.downloader.CountrySuggestFragment;
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
index 8c760bd414..b1ea928de1 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
@@ -17,8 +17,6 @@ import app.organicmaps.widget.PlaceholderView;
 import app.organicmaps.widget.SearchToolbarController;
 import app.organicmaps.util.UiUtils;
 
-import java.util.Objects;
-
 public class SearchHistoryFragment extends BaseMwmRecyclerFragment<SearchHistoryAdapter>
 {
   private PlaceholderView mPlaceHolder;
diff --git a/android/app/src/main/java/app/organicmaps/util/ConnectionState.java b/android/app/src/main/java/app/organicmaps/util/ConnectionState.java
index 3657e95f7c..7344785078 100644
--- a/android/app/src/main/java/app/organicmaps/util/ConnectionState.java
+++ b/android/app/src/main/java/app/organicmaps/util/ConnectionState.java
@@ -10,8 +10,6 @@ import android.telephony.TelephonyManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import app.organicmaps.MwmApplication;
-
 public enum ConnectionState
 {
   INSTANCE;
diff --git a/android/app/src/main/java/app/organicmaps/util/DateUtils.java b/android/app/src/main/java/app/organicmaps/util/DateUtils.java
index 4e4ae7e7d7..6918ff0b57 100644
--- a/android/app/src/main/java/app/organicmaps/util/DateUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/DateUtils.java
@@ -5,8 +5,6 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 
 import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Locale;
 
 public final class DateUtils
diff --git a/android/app/src/main/java/app/organicmaps/util/HttpClient.java b/android/app/src/main/java/app/organicmaps/util/HttpClient.java
index 99f7e6f361..ba115312e9 100644
--- a/android/app/src/main/java/app/organicmaps/util/HttpClient.java
+++ b/android/app/src/main/java/app/organicmaps/util/HttpClient.java
@@ -43,7 +43,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.InflaterInputStream;
diff --git a/android/app/src/main/java/app/organicmaps/util/UiUtils.java b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
index fafefe1afa..430aef19fe 100644
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -21,7 +21,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.Window;
-import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -32,7 +31,6 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
index 7d7e73b830..2f9ee68d68 100644
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java
@@ -12,7 +12,6 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import app.organicmaps.R;
-import app.organicmaps.util.Config;
 
 import java.util.ArrayList;
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
index d15e14c413..e5f76ebed1 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -15,7 +15,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
-import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
index b6092dc76e..ed9a2555c5 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -31,7 +31,6 @@ import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.bookmarks.data.RoadWarningMarkType;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.settings.RoadType;
-import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java
index d115f3850b..37dda1cc03 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java
@@ -13,8 +13,6 @@ import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 public class PlacePhoneAdapter extends RecyclerView.Adapter<PlacePhoneAdapter.ViewHolder>
 {