diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp
index 010a35e216..9fd5c27f6e 100644
--- a/android/jni/com/mapswithme/platform/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@@ -71,11 +71,13 @@ std::string Platform::GetMemoryInfo() const
   ASSERT(classMemLogging, ());
 
   jobject context = android::Platform::Instance().GetContext();
-  static jmethodID const getMemoryInfoId = jni::GetStaticMethodID(env,
-    static_cast<jclass>(*classMemLogging), "getMemoryInfo",
-    "(Landroid/content/Context;)Ljava/lang/String;");
-  jstring const memInfoString = (jstring)env->CallStaticObjectMethod(
-    static_cast<jclass>(*classMemLogging), getMemoryInfoId, context);
+  static jmethodID const getMemoryInfoId
+    = jni::GetStaticMethodID(env,
+                             static_cast<jclass>(*classMemLogging),
+                             "getMemoryInfo",
+                             "(Landroid/content/Context;)Ljava/lang/String;");
+  jstring const memInfoString = static_cast<jstring>(env->CallStaticObjectMethod(
+    static_cast<jclass>(*classMemLogging), getMemoryInfoId, context));
   ASSERT(memInfoString, ());
 
   return jni::ToNativeString(env, memInfoString);
diff --git a/android/src/com/mapswithme/util/Language.java b/android/src/com/mapswithme/util/Language.java
index f84abc7d3c..19d342b9f2 100644
--- a/android/src/com/mapswithme/util/Language.java
+++ b/android/src/com/mapswithme/util/Language.java
@@ -1,13 +1,11 @@
 package com.mapswithme.util;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
-import androidx.annotation.Nullable;
-import com.mapswithme.maps.MwmApplication;
+import androidx.annotation.NonNull;
 
 import java.util.Locale;