diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
index a3bc30fbb5..eedf3f3211 100644
--- a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
+++ b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
@@ -5,7 +5,6 @@
 #include "map/bookmark_helpers.hpp"
 #include "map/place_page_info.hpp"
 
-
 #include "coding/zip_creator.hpp"
 
 #include "platform/localization.hpp"
@@ -114,85 +113,18 @@ void PrepareClassRefs(JNIEnv * env)
       jni::GetMethodID(env, bookmarkManagerInstance, "onElevationActivePointChanged", "()V");
 }
 
-void OnElevationCurPositionChanged(JNIEnv * env)
-{
-  ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance =
-      env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
-  env->CallVoidMethod(bookmarkManagerInstance, g_onElevationCurrentPositionChangedMethod);
-  jni::HandleJavaException(env);
-}
-
-void OnElevationActivePointChanged(JNIEnv * env)
-{
-  ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
-  env->CallVoidMethod(bookmarkManagerInstance, g_onElevationActivePointChangedMethod);
-  jni::HandleJavaException(env);
-}
-
-void OnBookmarksChanged(JNIEnv * env)
-{
-  ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
-  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksChangedMethod);
-  jni::HandleJavaException(env);
-}
-
-void OnAsyncLoadingStarted(JNIEnv * env)
-{
-  ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
-  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksLoadingStartedMethod);
-  jni::HandleJavaException(env);
-}
-
-void OnAsyncLoadingFinished(JNIEnv * env)
-{
-  ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
-  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksLoadingFinishedMethod);
-  jni::HandleJavaException(env);
-}
-
-void OnAsyncLoadingFileSuccess(JNIEnv * env, std::string const & fileName, bool isTemporaryFile)
-{
-  ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
-  jni::TScopedLocalRef jFileName(env, jni::ToJavaString(env, fileName));
-  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksFileLoadedMethod,
-                      true /* success */, jFileName.get(), isTemporaryFile);
-  jni::HandleJavaException(env);
-}
-
-void OnAsyncLoadingFileError(JNIEnv * env, std::string const & fileName, bool isTemporaryFile)
-{
-  ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
-  jni::TScopedLocalRef jFileName(env, jni::ToJavaString(env, fileName));
-  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksFileLoadedMethod,
-                      false /* success */, jFileName.get(), isTemporaryFile);
-  jni::HandleJavaException(env);
-}
-
 void OnPreparedFileForSharing(JNIEnv * env, BookmarkManager::SharingResult const & result)
 {
   ASSERT(g_bookmarkManagerClass, ());
   jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
                                                               g_bookmarkManagerInstanceField);
 
-  static jclass const classBookmarkSharingResult = jni::GetGlobalClassRef(env,
+  static jclass classBookmarkSharingResult = jni::GetGlobalClassRef(env,
     "com/mapswithme/maps/bookmarks/data/BookmarkSharingResult");
   // Java signature : BookmarkSharingResult(long categoryId, @Code int code,
   //                                        @NonNull String sharingPath,
   //                                        @NonNull String errorString)
-  static jmethodID const ctorBookmarkSharingResult = jni::GetConstructorID(env,
+  static jmethodID ctorBookmarkSharingResult = jni::GetConstructorID(env,
     classBookmarkSharingResult, "(JILjava/lang/String;Ljava/lang/String;)V");
 
   jni::TScopedLocalRef const sharingPath(env, jni::ToJavaString(env, result.m_sharingPath));
@@ -206,56 +138,6 @@ void OnPreparedFileForSharing(JNIEnv * env, BookmarkManager::SharingResult const
   jni::HandleJavaException(env);
 }
 
-void OnCategorySortingResults(JNIEnv * env, long long timestamp,
-                              BookmarkManager::SortedBlocksCollection && sortedBlocks,
-                              BookmarkManager::SortParams::Status status)
-{
-  ASSERT(g_bookmarkManagerClass, ());
-  ASSERT(g_sortedBlockClass, ());
-  ASSERT(g_sortedBlockConstructor, ());
-
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
-
-  if (status == BookmarkManager::SortParams::Status::Cancelled)
-  {
-    env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksSortingCancelled,
-                        static_cast<jlong>(timestamp));
-    jni::HandleJavaException(env);
-    return;
-  }
-
-  jni::TScopedLocalObjectArrayRef blocksRef(env,
-      jni::ToJavaArray(env, g_sortedBlockClass, sortedBlocks,
-          [](JNIEnv * env, BookmarkManager::SortedBlock const & block)
-          {
-            jni::TScopedLocalRef blockNameRef(env, jni::ToJavaString(env, block.m_blockName));
-
-            jni::TScopedLocalObjectArrayRef marksRef(env,
-                jni::ToJavaArray(env, g_longClass, block.m_markIds,
-                    [](JNIEnv * env, kml::MarkId const & markId)
-                    {
-                      return env->NewObject(g_longClass, g_longConstructor,
-                          static_cast<jlong>(markId));
-                    }));
-
-            jni::TScopedLocalObjectArrayRef tracksRef(env,
-                jni::ToJavaArray(env, g_longClass, block.m_trackIds,
-                    [](JNIEnv * env, kml::TrackId const & trackId)
-                    {
-                      return env->NewObject(g_longClass, g_longConstructor,
-                          static_cast<jlong>(trackId));
-                    }));
-
-            return env->NewObject(g_sortedBlockClass, g_sortedBlockConstructor,
-                                 blockNameRef.get(), marksRef.get(), tracksRef.get());
-
-          }));
-  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksSortingCompleted,
-                      blocksRef.get(), static_cast<jlong>(timestamp));
-  jni::HandleJavaException(env);
-}
-
 Bookmark const * getBookmark(jlong bokmarkId)
 {
   Bookmark const * pBmk = frm()->GetBookmarkManager().GetBookmark(static_cast<kml::MarkId>(bokmarkId));
@@ -299,64 +181,58 @@ jobjectArray MakeCategories(JNIEnv * env, kml::GroupIdCollection const & ids)
 extern "C"
 {
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeShowBookmarkOnMap(
-    JNIEnv * env, jobject thiz, jlong bmkId)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeShowBookmarkOnMap(JNIEnv *, jobject thiz, jlong bmkId)
 {
   frm()->ShowBookmark(static_cast<kml::MarkId>(bmkId));
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeShowBookmarkCategoryOnMap(
-    JNIEnv * env, jobject thiz, jlong catId)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeShowBookmarkCategoryOnMap(JNIEnv *, jobject, jlong catId)
 {
   frm()->ShowBookmarkCategory(static_cast<kml::MarkGroupId>(catId), true /* animated */);
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * env, jobject)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * env, jobject thiz)
 {
+  // TODO: Remove.
   PrepareClassRefs(env);
   BookmarkManager::AsyncLoadingCallbacks callbacks;
-  callbacks.m_onStarted = std::bind(&OnAsyncLoadingStarted, env);
-  callbacks.m_onFinished = std::bind(&OnAsyncLoadingFinished, env);
-  callbacks.m_onFileSuccess = std::bind(&OnAsyncLoadingFileSuccess, env, _1, _2);
-  callbacks.m_onFileError = std::bind(&OnAsyncLoadingFileError, env, _1, _2);
-  frm()->GetBookmarkManager().SetAsyncLoadingCallbacks(std::move(callbacks));
+  callbacks.m_onStarted = [env, thiz]()
+  {
+    env->CallVoidMethod(thiz, g_onBookmarksLoadingStartedMethod);
+    jni::HandleJavaException(env);
+  };
+  callbacks.m_onFinished = [env, thiz]()
+  {
+    env->CallVoidMethod(thiz, g_onBookmarksLoadingFinishedMethod);
+    jni::HandleJavaException(env);
+  };
+  callbacks.m_onFileSuccess = [env, thiz](std::string const & fileName, bool isTemporaryFile)
+  {
+    jni::TScopedLocalRef jFileName(env, jni::ToJavaString(env, fileName));
+    env->CallVoidMethod(thiz, g_onBookmarksFileLoadedMethod, true /* success */, jFileName.get(), isTemporaryFile);
+    jni::HandleJavaException(env);
+  };
+  callbacks.m_onFileError = [env, thiz](std::string const & fileName, bool isTemporaryFile)
+  {
+    jni::TScopedLocalRef jFileName(env, jni::ToJavaString(env, fileName));
+    env->CallVoidMethod(thiz, g_onBookmarksFileLoadedMethod, false /* success */, jFileName.get(), isTemporaryFile);
+    jni::HandleJavaException(env);
+  };
 
-  frm()->GetBookmarkManager().SetBookmarksChangedCallback(std::bind(&OnBookmarksChanged, env));
-
-  frm()->LoadBookmarks();
-}
-
-JNIEXPORT jint JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCategoriesCount(
-        JNIEnv * env, jobject thiz)
-{
-  return static_cast<int>(frm()->GetBookmarkManager().GetBmGroupsIdList().size());
-}
-
-JNIEXPORT jint JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCategoryPositionById(
-        JNIEnv * env, jobject thiz, jlong catId)
-{
-  auto & ids = frm()->GetBookmarkManager().GetBmGroupsIdList();
-  jint position = 0;
-  while (position < ids.size() && ids[position] != catId)
-    ++position;
-  return position;
+  auto f = frm();
+  f->GetBookmarkManager().SetAsyncLoadingCallbacks(std::move(callbacks));
+  f->GetBookmarkManager().SetBookmarksChangedCallback([env, thiz]()
+  {
+    env->CallVoidMethod(thiz, g_onBookmarksChangedMethod);
+    jni::HandleJavaException(env);
+  });
+  f->LoadBookmarks();
 }
 
 JNIEXPORT jlong JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCategoryIdByPosition(
-        JNIEnv * env, jobject thiz, jint position)
-{
-  auto & ids = frm()->GetBookmarkManager().GetBmGroupsIdList();
-  return static_cast<jlong>(position < ids.size() ? ids[position] : kml::kInvalidMarkGroupId);
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeCreateCategory(
-     JNIEnv * env, jobject thiz, jstring name)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeCreateCategory(JNIEnv * env, jobject, jstring name)
 {
   auto const categoryId = frm()->GetBookmarkManager().CreateBookmarkCategory(ToNativeString(env, name));
   frm()->GetBookmarkManager().SetLastEditedBmCategory(categoryId);
@@ -364,8 +240,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeCreateCategory(
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeDeleteCategory(
-     JNIEnv * env, jobject thiz, jlong catId)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeDeleteCategory(JNIEnv *, jobject, jlong catId)
 {
   auto const categoryId = static_cast<kml::MarkGroupId>(catId);
   return static_cast<jboolean>(frm()->GetBookmarkManager().GetEditSession().DeleteBmCategory(categoryId));
@@ -430,7 +305,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetLastEditedColor
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeLoadBookmarksFile(JNIEnv * env, jobject thiz,
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeLoadBookmarksFile(JNIEnv * env, jclass,
                                                                                 jstring path, jboolean isTemporaryFile)
 {
   frm()->AddBookmarksFile(ToNativeString(env, path), isTemporaryFile);
@@ -465,18 +340,14 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryName(
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryDescription(JNIEnv * env,
-                                                                                     jobject thiz,
-                                                                                     jlong catId,
-                                                                                     jstring desc)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryDescription(JNIEnv * env, jobject, jlong catId, jstring desc)
 {
-  frm()->GetBookmarkManager().GetEditSession().SetCategoryDescription(
-      static_cast<kml::MarkGroupId>(catId), jni::ToNativeString(env, desc));
+  frm()->GetBookmarkManager().GetEditSession().SetCategoryDescription(static_cast<kml::MarkGroupId>(catId),
+                                                                      jni::ToNativeString(env, desc));
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryTags(
-    JNIEnv * env, jobject, jlong catId, jobjectArray tagsIds)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryTags(JNIEnv * env, jobject, jlong catId, jobjectArray tagsIds)
 {
   auto const size = env->GetArrayLength(tagsIds);
   std::vector<std::string> categoryTags;
@@ -507,33 +378,9 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetCategoryCustomP
     static_cast<kml::MarkGroupId>(catId), ToNativeString(env, key), ToNativeString(env, value));
 }
 
-JNIEXPORT jstring JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCategoryName(
-     JNIEnv * env, jobject thiz, jlong catId)
-{
-  return ToJavaString(env, frm()->GetBookmarkManager().GetCategoryName(
-                      static_cast<kml::MarkGroupId>(catId)));
-}
-
-JNIEXPORT jint JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarksCount(
-     JNIEnv * env, jobject thiz, jlong catId)
-{
-  return static_cast<int>(frm()->GetBookmarkManager().GetUserMarkIds(
-      static_cast<kml::MarkGroupId>(catId)).size());
-}
-
-JNIEXPORT jint JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTracksCount(
-     JNIEnv * env, jobject thiz, jlong catId)
-{
-  return static_cast<int>(frm()->GetBookmarkManager().GetTrackIds(
-      static_cast<kml::MarkGroupId>(catId)).size());
-}
-
 JNIEXPORT jobject JNICALL
 Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlacePage(
-     JNIEnv * env, jobject thiz, jlong bmkId)
+     JNIEnv * env, jobject, jlong bmkId)
 {
   if (!frm()->HasPlacePageInfo())
     return nullptr;
@@ -560,24 +407,21 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo(
 
 JNIEXPORT jlong JNICALL
 Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPosition(
-        JNIEnv * env, jobject thiz, jlong catId, jint positionInCategory)
+        JNIEnv * env, jobject, jlong catId, jint positionInCategory)
 {
   auto & ids = frm()->GetBookmarkManager().GetUserMarkIds(static_cast<kml::MarkGroupId>(catId));
-  if (positionInCategory >= ids.size())
+  if (positionInCategory >= static_cast<jint>(ids.size()))
     return static_cast<jlong>(kml::kInvalidMarkId);
   auto it = ids.begin();
   std::advance(it, positionInCategory);
   return static_cast<jlong>(*it);
 }
 
-static uint32_t shift(uint32_t v, uint8_t bitCount) { return v << bitCount; }
-
 JNIEXPORT jobject JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTrack(
-      JNIEnv * env, jobject thiz, jlong trackId, jclass trackClazz)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTrack(JNIEnv * env, jobject, jlong trackId, jclass trackClazz)
 {
   // Track(long trackId, long categoryId, String name, String lengthString, int color)
-  static jmethodID const cId = jni::GetConstructorID(env, trackClazz,
+  static jmethodID cId = jni::GetConstructorID(env, trackClazz,
                                                      "(JJLjava/lang/String;Ljava/lang/String;I)V");
   auto const * nTrack = frm()->GetBookmarkManager().GetTrack(static_cast<kml::TrackId>(trackId));
 
@@ -587,24 +431,18 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTrack(
   std::string formattedLength = measurement_utils::FormatDistanceWithLocalization(nTrack->GetLengthMeters(),
                                                                                   localizedUnits.m_high,
                                                                                   localizedUnits.m_low);
-  dp::Color nColor = nTrack->GetColor(0);
+  dp::Color const c = nTrack->GetColor(0);
+  jint const androidColor = (c.GetAlpha() << 24) + (c.GetRed() << 16) + (c.GetGreen() << 8) + c.GetBlue();
 
-  jint androidColor = shift(nColor.GetAlpha(), 24) +
-                      shift(nColor.GetRed(), 16) +
-                      shift(nColor.GetGreen(), 8) +
-                      nColor.GetBlue();
-
-  return env->NewObject(trackClazz, cId,
-                        trackId, static_cast<jlong>(nTrack->GetGroupId()), jni::ToJavaString(env, nTrack->GetName()),
-                        jni::ToJavaString(env, formattedLength), androidColor);
+  return env->NewObject(trackClazz, cId, trackId, static_cast<jlong>(nTrack->GetGroupId()),
+                        jni::ToJavaString(env, nTrack->GetName()), jni::ToJavaString(env, formattedLength), androidColor);
 }
 
 JNIEXPORT jlong JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition(
-        JNIEnv * env, jobject thiz, jlong catId, jint positionInCategory)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition(JNIEnv * env, jobject thiz, jlong catId, jint positionInCategory)
 {
   auto & ids = frm()->GetBookmarkManager().GetTrackIds(static_cast<kml::MarkGroupId>(catId));
-  if (positionInCategory >= ids.size())
+  if (positionInCategory >= static_cast<jint>(ids.size()))
     return static_cast<jlong>(kml::kInvalidTrackId);
   auto it = ids.begin();
   std::advance(it, positionInCategory);
@@ -613,7 +451,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetTrackIdByPositi
 
 JNIEXPORT jboolean JNICALL
 Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeIsUsedCategoryName(
-        JNIEnv * env, jobject thiz, jstring name)
+    JNIEnv * env, jclass, jstring name)
 {
   return static_cast<jboolean>(frm()->GetBookmarkManager().IsUsedCategoryName(
                                ToNativeString(env, name)));
@@ -688,16 +526,13 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeAreNotificationsEn
 }
 
 JNIEXPORT jobject JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategory(JNIEnv *env,
-                                                                                  jobject,
-                                                                                  jlong id)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategory(JNIEnv *env, jobject, jlong id)
 {
   return MakeCategory(env, static_cast<kml::MarkGroupId>(id));
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories(JNIEnv *env,
-  jobject)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories(JNIEnv *env, jobject)
 {
   auto const & bm = frm()->GetBookmarkManager();
   auto const & ids = bm.GetBmGroupsIdList();
@@ -706,9 +541,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategor
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetChildrenCategories(JNIEnv *env,
-                                                                                    jobject,
-                                                                                    jlong parentId)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetChildrenCategories(JNIEnv *env, jobject, jlong parentId)
 {
   auto const & bm = frm()->GetBookmarkManager();
   auto const ids = bm.GetChildrenCategories(static_cast<kml::MarkGroupId>(parentId));
@@ -716,17 +549,6 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetChildrenCategor
   return MakeCategories(env, ids);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetChildrenCollections(JNIEnv *env,
-                                                                                     jobject,
-                                                                                     jlong parentId)
-{
-  auto const & bm = frm()->GetBookmarkManager();
-  auto const ids = bm.GetChildrenCollections(static_cast<kml::MarkGroupId>(parentId));
-
-  return MakeCategories(env, ids);
-}
-
 JNIEXPORT jboolean JNICALL
 Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeHasLastSortingType(
     JNIEnv *, jobject, jlong catId)
@@ -783,9 +605,10 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetAvailableSortin
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetSortedCategory(JNIEnv *env,
-    jobject, jlong catId, jint sortingType, jboolean hasMyPosition, jdouble lat, jdouble lon,
-    jlong timestamp)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetSortedCategory(JNIEnv *env, jobject thiz,
+                                                                                jlong catId, jint sortingType,
+                                                                                jboolean hasMyPosition, jdouble lat,
+                                                                                jdouble lon, jlong timestamp)
 {
   auto & bm = frm()->GetBookmarkManager();
   BookmarkManager::SortParams sortParams;
@@ -794,14 +617,47 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetSortedCategory(
   sortParams.m_hasMyPosition = static_cast<bool>(hasMyPosition);
   sortParams.m_myPosition = mercator::FromLatLon(static_cast<double>(lat),
       static_cast<double>(lon));
-  sortParams.m_onResults = bind(&OnCategorySortingResults, env, timestamp, _1, _2);
+  sortParams.m_onResults = [env, thiz, timestamp](BookmarkManager::SortedBlocksCollection && sortedBlocks,
+                                                  BookmarkManager::SortParams::Status status)
+  {
+    ASSERT(g_sortedBlockClass, ());
+    ASSERT(g_sortedBlockConstructor, ());
+
+    if (status == BookmarkManager::SortParams::Status::Cancelled)
+    {
+      env->CallVoidMethod(thiz, g_onBookmarksSortingCancelled, static_cast<jlong>(timestamp));
+      jni::HandleJavaException(env);
+      return;
+    }
+
+    jni::TScopedLocalObjectArrayRef blocksRef(env, jni::ToJavaArray(env, g_sortedBlockClass, sortedBlocks,
+        [](JNIEnv * env, BookmarkManager::SortedBlock const & block)
+        {
+          jni::TScopedLocalRef blockNameRef(env, jni::ToJavaString(env, block.m_blockName));
+          jni::TScopedLocalObjectArrayRef marksRef(env, jni::ToJavaArray(env, g_longClass, block.m_markIds,
+              [](JNIEnv * env, kml::MarkId const & markId)
+              {
+                return env->NewObject(g_longClass, g_longConstructor, static_cast<jlong>(markId));
+              }));
+
+          jni::TScopedLocalObjectArrayRef tracksRef(env, jni::ToJavaArray(env, g_longClass, block.m_trackIds,
+              [](JNIEnv * env, kml::TrackId const & trackId)
+              {
+                return env->NewObject(g_longClass, g_longConstructor, static_cast<jlong>(trackId));
+              }));
+          return env->NewObject(g_sortedBlockClass, g_sortedBlockConstructor, blockNameRef.get(), marksRef.get(), tracksRef.get());
+        }));
+    env->CallVoidMethod(thiz, g_onBookmarksSortingCompleted, blocksRef.get(), static_cast<jlong>(timestamp));
+    jni::HandleJavaException(env);
+  }
+
 
   bm.GetSortedCategory(sortParams);
 }
 
 JNIEXPORT jstring JNICALL
 Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkName(
-  JNIEnv * env, jobject thiz, jlong bmk)
+  JNIEnv * env, jobject, jlong bmk)
 {
   return jni::ToJavaString(env, getBookmark(bmk)->GetPreferredName());
 }
@@ -840,9 +696,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon(
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetBookmarkParams(
-  JNIEnv * env, jobject thiz, jlong bmk,
-  jstring name, jint color, jstring descr)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetBookmarkParams(JNIEnv * env, jobject thiz, jlong bmk, jstring name, jint color, jstring description)
 {
   auto const * mark = getBookmark(bmk);
 
@@ -851,64 +705,60 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetBookmarkParams(
   auto const bmName = jni::ToNativeString(env, name);
   if (mark->GetPreferredName() != bmName)
     kml::SetDefaultStr(bmData.m_customName, bmName);
-  if (descr)
-    kml::SetDefaultStr(bmData.m_description, jni::ToNativeString(env, descr));
+  if (description)
+    kml::SetDefaultStr(bmData.m_description, jni::ToNativeString(env, description));
   bmData.m_color.m_predefinedColor = static_cast<kml::PredefinedColor>(color);
 
   g_framework->ReplaceBookmark(static_cast<kml::MarkId>(bmk), bmData);
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory(
-  JNIEnv * env, jobject thiz, jlong oldCat, jlong newCat, jlong bmk)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory(JNIEnv *, jobject thiz, jlong oldCat, jlong newCat, jlong bmk)
 {
   g_framework->MoveBookmark(static_cast<kml::MarkId>(bmk), static_cast<kml::MarkGroupId>(oldCat),
                             static_cast<kml::MarkGroupId>(newCat));
 }
 
 JNIEXPORT jobject JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkXY(
-  JNIEnv * env, jobject thiz, jlong bmk)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkXY(JNIEnv * env, jobject thiz, jlong bmk)
 {
   return jni::GetNewParcelablePointD(env, getBookmark(bmk)->GetPivot());
 }
 
 JNIEXPORT jdouble JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkScale(
-  JNIEnv * env, jobject thiz, jlong bmk)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkScale(JNIEnv *, jobject thiz, jlong bmk)
 {
   return getBookmark(bmk)->GetScale();
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeEncode2Ge0Url(
-  JNIEnv * env, jobject thiz, jlong bmk, jboolean addName)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeEncode2Ge0Url(JNIEnv * env, jobject thiz, jlong bmk, jboolean addName)
 {
-  return jni::ToJavaString(env, frm()->CodeGe0url(getBookmark(bmk), addName));
+  return jni::ToJavaString(env, Framework::CodeGe0url(getBookmark(bmk), addName));
 }
 
-JNIEXPORT jobject JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress(
-  JNIEnv * env, jobject thiz, jlong bmkId)
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress(JNIEnv * env, jobject thiz, jlong bmkId)
 {
   auto const address = frm()->GetAddressAtPoint(getBookmark(bmkId)->GetPivot()).FormatAddress();
   return jni::ToJavaString(env, address);
 }
 
 JNIEXPORT jdouble JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetElevationCurPositionDistance(
-    JNIEnv * env, jclass clazz, jlong trackId)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetElevationCurPositionDistance(JNIEnv *, jclass, jlong trackId)
 {
   auto & bm = frm()->GetBookmarkManager();
   return static_cast<jdouble>(bm.GetElevationMyPosition(static_cast<kml::TrackId>(trackId)));
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPositionChangedListener(
-        JNIEnv * env, jclass clazz)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPositionChangedListener(JNIEnv * env, jobject thiz)
 {
-  frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback(
-      std::bind(&OnElevationCurPositionChanged, env));
+  frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback([env, thiz]()
+  {
+    env->CallVoidMethod(thiz, g_onElevationCurrentPositionChangedMethod);
+    jni::HandleJavaException(env);
+  });
 }
 
 JNIEXPORT void JNICALL
@@ -936,15 +786,17 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetElevationActive
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetElevationActiveChangedListener(
-   JNIEnv *env, jclass clazz)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetElevationActiveChangedListener(JNIEnv *env, jobject thiz)
 {
-  frm()->GetBookmarkManager().SetElevationActivePointChangedCallback(std::bind(&OnElevationActivePointChanged, env));
+  frm()->GetBookmarkManager().SetElevationActivePointChangedCallback([env, thiz]()
+  {
+    env->CallVoidMethod(thiz, g_onElevationActivePointChangedMethod);
+    jni::HandleJavaException(env);
+  });
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeRemoveElevationActiveChangedListener(
-        JNIEnv *env, jclass)
+Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeRemoveElevationActiveChangedListener(JNIEnv *env, jclass)
 {
   frm()->GetBookmarkManager().SetElevationActivePointChangedCallback(nullptr);
 }
diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java
index a92b96eea0..53cd4b4cf5 100644
--- a/android/src/com/mapswithme/maps/MwmApplication.java
+++ b/android/src/com/mapswithme/maps/MwmApplication.java
@@ -221,7 +221,7 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
     initNativeStrings();
     ThemeSwitcher.INSTANCE.initialize(this);
     SearchEngine.INSTANCE.initialize(null);
-    BookmarkManager.loadBookmarks();
+    BookmarkManager.INSTANCE.nativeLoadBookmarks();
     TtsPlayer.INSTANCE.initialize(this);
     ThemeSwitcher.INSTANCE.restart(false);
     LocationHelper.INSTANCE.initialize(this);
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkInfo.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkInfo.java
index 94920ffcf3..fc4fa59d0c 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkInfo.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkInfo.java
@@ -28,7 +28,7 @@ public class BookmarkInfo
   {
     mCategoryId = categoryId;
     mBookmarkId = bookmarkId;
-    mTitle = BookmarkManager.INSTANCE.getBookmarkName(mBookmarkId);
+    mTitle = BookmarkManager.INSTANCE.nativeGetBookmarkName(mBookmarkId);
     mFeatureType = BookmarkManager.INSTANCE.getBookmarkFeatureType(mBookmarkId);
     mIcon = new Icon(BookmarkManager.INSTANCE.getBookmarkColor(mBookmarkId),
                      BookmarkManager.INSTANCE.getBookmarkIcon(mBookmarkId));
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
index e595541fc3..4477b9959b 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
@@ -245,8 +245,7 @@ public enum BookmarkManager
   // Called from JNI.
   @SuppressWarnings("unused")
   @MainThread
-  public void onBookmarksFileLoaded(boolean success, @NonNull String fileName,
-                                    boolean isTemporaryFile)
+  public void onBookmarksFileLoaded(boolean success, @NonNull String fileName, boolean isTemporaryFile)
   {
     // Android could create temporary file with bookmarks in some cases (KML/KMZ file is a blob
     // in the intent, so we have to create a temporary file on the disk). Here we can delete it.
@@ -384,8 +383,6 @@ public enum BookmarkManager
     return nativeGetTrackIdByPosition(catId, positionInCategory);
   }
 
-  public static void loadBookmarks() { nativeLoadBookmarks(); }
-
   public void deleteCategory(long catId) { nativeDeleteCategory(catId); }
 
   public void deleteTrack(long trackId)
@@ -582,11 +579,6 @@ public enum BookmarkManager
     return nativeGetCatalogFrontendUrl(utm);
   }
 
-  public void requestRouteTags()
-  {
-    nativeRequestCatalogTags();
-  }
-
   public boolean hasLastSortingType(long catId) { return nativeHasLastSortingType(catId); }
 
   @SortingType
@@ -626,12 +618,6 @@ public enum BookmarkManager
   @NonNull
   native BookmarkCategory[] nativeGetChildrenCategories(long catId);
 
-  @NonNull
-  public String getBookmarkName(@IntRange(from = 0) long bookmarkId)
-  {
-    return nativeGetBookmarkName(bookmarkId);
-  }
-
   @NonNull
   public String getBookmarkFeatureType(@IntRange(from = 0) long bookmarkId)
   {
@@ -772,13 +758,7 @@ public enum BookmarkManager
 
   private native void nativeSetCategoryDescription(long catId, @NonNull String desc);
 
-  private native void nativeSetCategoryTags(long catId, @NonNull String[] tagsIds);
-
-  private native void nativeSetCategoryAccessRules(long catId, int accessRules);
-
-  private native void nativeSetCategoryCustomProperty(long catId, String key, String value);
-
-  private static native void nativeLoadBookmarks();
+  public native void nativeLoadBookmarks();
 
   private native boolean nativeDeleteCategory(long catId);
 
@@ -817,41 +797,14 @@ public enum BookmarkManager
 
   private static native boolean nativeAreAllCategoriesInvisible();
 
-  private static native void nativeSetChildCategoriesVisibility(long catId, boolean visible);
-
   private static native void nativeSetAllCategoriesVisibility(boolean visible);
 
   private static native void nativePrepareFileForSharing(long catId);
 
-  private static native boolean nativeIsCategoryEmpty(long catId);
-
   private static native void nativeSetNotificationsEnabled(boolean enabled);
 
   private static native boolean nativeAreNotificationsEnabled();
 
-  @NonNull
-  private static native String nativeGetCatalogDeeplink(long catId);
-
-  @NonNull
-  private static native String nativeGetCatalogPublicLink(long catId);
-
-  @NonNull
-  private static native String nativeGetWebEditorUrl(@NonNull String serverId);
-
-  @NonNull
-  private static native String nativeGetCatalogFrontendUrl(@UTM.UTMType int utm);
-
-  @NonNull
-  private static native KeyValue[] nativeGetCatalogHeaders();
-
-  @NonNull
-  private static native String nativeInjectCatalogUTMContent(@NonNull String url,
-                                                             @UTM.UTMContentType int content);
-
-  private static native void nativeRequestCatalogTags();
-
-  private static native void nativeRequestCatalogCustomProperties();
-
   private native boolean nativeHasLastSortingType(long catId);
 
   @SortingType
@@ -865,12 +818,12 @@ public enum BookmarkManager
   @SortingType
   private native int[] nativeGetAvailableSortingTypes(long catId, boolean hasMyPosition);
 
-  private native boolean nativeGetSortedCategory(long catId, @SortingType int sortingType,
-                                                 boolean hasMyPosition, double lat, double lon,
-                                                 long timestamp);
+  private native void nativeGetSortedCategory(long catId, @SortingType int sortingType,
+                                              boolean hasMyPosition, double lat, double lon,
+                                              long timestamp);
 
   @NonNull
-  private static native String nativeGetBookmarkName(@IntRange(from = 0) long bookmarkId);
+  public native String nativeGetBookmarkName(@IntRange(from = 0) long bookmarkId);
 
   @NonNull
   private static native String nativeGetBookmarkFeatureType(@IntRange(from = 0) long bookmarkId);
@@ -907,7 +860,7 @@ public enum BookmarkManager
 
   private static native double nativeGetElevationCurPositionDistance(long trackId);
 
-  private static native void nativeSetElevationCurrentPositionChangedListener();
+  private native void nativeSetElevationCurrentPositionChangedListener();
 
   public static native void nativeRemoveElevationCurrentPositionChangedListener();
 
@@ -915,7 +868,7 @@ public enum BookmarkManager
 
   private static native double nativeGetElevationActivePointDistance(long trackId);
 
-  private static native void nativeSetElevationActiveChangedListener();
+  private native void nativeSetElevationActiveChangedListener();
 
   public static native void nativeRemoveElevationActiveChangedListener();
 
diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java
index 9182e42299..606fa961df 100644
--- a/android/src/com/mapswithme/maps/location/LocationHelper.java
+++ b/android/src/com/mapswithme/maps/location/LocationHelper.java
@@ -97,7 +97,7 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
     @Override
     public void onLocationError(int errorCode)
     {
-      mLogger.d(TAG, "onLocationError errorCode = " + errorCode, new Throwable());
+      mLogger.d(TAG, "onLocationError errorCode = " + errorCode);
       mSavedLocation = null;
       nativeOnLocationError(errorCode);
       mLogger.d(TAG, "nativeOnLocationError errorCode = " + errorCode +
diff --git a/base/fifo_cache.hpp b/base/fifo_cache.hpp
index 8dda0592e9..d202f92609 100644
--- a/base/fifo_cache.hpp
+++ b/base/fifo_cache.hpp
@@ -6,15 +6,13 @@
 #include <functional>
 #include <unordered_map>
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wdeprecated-copy"
 #endif
-
 #include <boost/circular_buffer.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic pop
 #endif
 
 template<class Key, class Value, class HashContainer = std::unordered_map<Key, Value>>
diff --git a/coding/base64.cpp b/coding/base64.cpp
index 3b7642cb2f..05eecab071 100644
--- a/coding/base64.cpp
+++ b/coding/base64.cpp
@@ -1,21 +1,16 @@
 #include "coding/base64.hpp"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wreorder"
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#ifdef __clang__
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wunused-local-typedef"
 #endif
-
 #include <boost/algorithm/string.hpp>
 #include <boost/archive/iterators/base64_from_binary.hpp>
 #include <boost/archive/iterators/binary_from_base64.hpp>
 #include <boost/archive/iterators/transform_width.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
+#ifdef __clang__
+  #pragma clang diagnostic pop
 #endif
-#pragma GCC diagnostic pop
 
 namespace base64
 {
diff --git a/coding/internal/xmlparser.hpp b/coding/internal/xmlparser.hpp
index a7b5070956..5e02d275f8 100644
--- a/coding/internal/xmlparser.hpp
+++ b/coding/internal/xmlparser.hpp
@@ -3,11 +3,6 @@
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#endif
-
 #include <memory>
 #include <sstream>
 #include <string>
@@ -15,10 +10,6 @@
 #define XML_STATIC
 #include "3party/expat/expat/lib/expat.h"
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 template <typename DispatcherT>
 class XmlParser
 {
diff --git a/coding/map_uint32_to_val.hpp b/coding/map_uint32_to_val.hpp
index f719bc2e23..744f4ab19c 100644
--- a/coding/map_uint32_to_val.hpp
+++ b/coding/map_uint32_to_val.hpp
@@ -13,18 +13,9 @@
 #include "base/checked_cast.hpp"
 #include "base/logging.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-private-field"
-#endif
-
 #include "3party/succinct/elias_fano.hpp"
 #include "3party/succinct/rs_bit_vector.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 #include <algorithm>
 #include <cstdint>
 #include <functional>
diff --git a/coding/simple_dense_coding.cpp b/coding/simple_dense_coding.cpp
index 265bcef10a..3581795cf4 100644
--- a/coding/simple_dense_coding.cpp
+++ b/coding/simple_dense_coding.cpp
@@ -5,15 +5,13 @@
 #include <algorithm>
 #include <limits>
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#ifdef __clang__
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wunused-local-typedef"
 #endif
-
 #include <boost/range/adaptor/transformed.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
+#ifdef __clang__
+  #pragma clang diagnostic pop
 #endif
 
 namespace coding
diff --git a/coding/simple_dense_coding.hpp b/coding/simple_dense_coding.hpp
index e23e633a8d..f0e8f88fda 100644
--- a/coding/simple_dense_coding.hpp
+++ b/coding/simple_dense_coding.hpp
@@ -3,17 +3,7 @@
 #include <cstdint>
 #include <vector>
 
-#if defined(__clang__)
-  #pragma clang diagnostic push
-  #pragma clang diagnostic ignored "-Wunused-private-field"
-#endif
- 
 #include "3party/succinct/elias_fano_compressed_list.hpp"
- 
-#if defined(__clang__)
-  #pragma clang diagnostic pop
-#endif
-
 
 namespace coding
 {
diff --git a/coding/succinct_mapper.hpp b/coding/succinct_mapper.hpp
index cacae80143..3de15bbbdb 100644
--- a/coding/succinct_mapper.hpp
+++ b/coding/succinct_mapper.hpp
@@ -7,18 +7,9 @@
 
 #include <type_traits>
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif
-
 #include "3party/succinct/mappable_vector.hpp"
 #include "3party/succinct/mapper.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 namespace coding
 {
 template <typename T>
diff --git a/geometry/intersection_score.hpp b/geometry/intersection_score.hpp
index 3c823a54b5..11346e2392 100644
--- a/geometry/intersection_score.hpp
+++ b/geometry/intersection_score.hpp
@@ -12,8 +12,15 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
 #pragma clang diagnostic ignored "-Wcomma"
-#endif
+#endif  // __clang__
+#ifdef __gcc__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#endif  // __gcc__
 #include <boost/geometry.hpp>
+#ifdef __gcc__
+#pragma GCC diagnostic pop
+#endif
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/geometry/robust_orientation.cpp b/geometry/robust_orientation.cpp
index 6f8cfedb81..81844b976a 100644
--- a/geometry/robust_orientation.cpp
+++ b/geometry/robust_orientation.cpp
@@ -5,14 +5,7 @@
 #include <algorithm>
 
 extern "C" {
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wconditional-uninitialized"
 #include "3party/robust/predicates.c"
-#pragma clang diagnostic pop
-#else
-#include "3party/robust/predicates.c"
-#endif
 }
 
 using namespace std;
diff --git a/indexer/features_offsets_table.hpp b/indexer/features_offsets_table.hpp
index 1c693270a1..28adcc6bb8 100644
--- a/indexer/features_offsets_table.hpp
+++ b/indexer/features_offsets_table.hpp
@@ -10,18 +10,9 @@
 #include <string>
 #include <vector>
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-private-field"
-#endif
-
 #include "3party/succinct/elias_fano.hpp"
 #include "3party/succinct/mapper.hpp"
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 namespace platform
 {
   class LocalCountryFile;
diff --git a/indexer/interval_index.hpp b/indexer/interval_index.hpp
index 7c7c200e51..4ecfd7c3a9 100644
--- a/indexer/interval_index.hpp
+++ b/indexer/interval_index.hpp
@@ -80,10 +80,10 @@ private:
     buffer_vector<uint8_t, 1024> data;
     data.resize_no_init(size);
 
-    m_Reader.Read(offset, &data[0], size);
-    ArrayByteSource src(&data[0]);
+    m_Reader.Read(offset, data.data(), size);
+    ArrayByteSource src(data.data());
 
-    void const * pEnd = &data[0] + size;
+    void const * pEnd = data.data() + size;
     Value value = 0;
     while (src.Ptr() < pEnd)
     {
@@ -122,8 +122,8 @@ private:
     buffer_vector<uint8_t, 576> data;
     data.resize_no_init(size);
 
-    m_Reader.Read(offset, &data[0], size);
-    ArrayByteSource src(&data[0]);
+    m_Reader.Read(offset, data.data(), size);
+    ArrayByteSource src(data.data());
 
     uint32_t const offsetAndFlag = ReadVarUint<uint32_t>(src);
     uint32_t childOffset = offsetAndFlag >> 1;
@@ -147,12 +147,12 @@ private:
         }
       }
       ASSERT(end0 != (static_cast<uint32_t>(1) << m_Header.m_BitsPerLevel) - 1 ||
-             static_cast<uint8_t const *>(src.Ptr()) - &data[0] == size,
-             (beg, end, beg0, end0, offset, size, src.Ptr(), &data[0]));
+             static_cast<uint8_t const *>(src.Ptr()) - data.data() == size,
+             (beg, end, beg0, end0, offset, size, src.Ptr(), data.data()));
     }
     else
     {
-      void const * pEnd = &data[0] + size;
+      void const * pEnd = data.data() + size;
       while (src.Ptr() < pEnd)
       {
         uint8_t const i = src.ReadByte();
diff --git a/indexer/succinct_trie_reader.hpp b/indexer/succinct_trie_reader.hpp
index ab2fd29805..378f7d9645 100644
--- a/indexer/succinct_trie_reader.hpp
+++ b/indexer/succinct_trie_reader.hpp
@@ -15,17 +15,7 @@
 #include <utility>
 #include <vector>
 
-#if defined(__clang__)
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wunused-private-field"
-#endif
- 
 #include "3party/succinct/rs_bit_vector.hpp"
- 
-#if defined(__clang__)
-  #pragma clang diagnostic pop
-#endif
-
 
 namespace trie
 {
diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp
index 33f8dfef1e..aacf29ad26 100644
--- a/platform/measurement_utils.cpp
+++ b/platform/measurement_utils.cpp
@@ -249,8 +249,8 @@ string FormatSpeedUnits(Units units)
 string FormatOsmLink(double lat, double lon, int zoom)
 {
   static char char_array[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~";
-  uint32_t const x = round((lon + 180.0) / 360.0 * (1L<<32));
-  uint32_t const y = round((lat + 90.0) / 180.0 * (1L<<32));
+  uint32_t const x = round((lon + 180.0) / 360.0 * (1LL << 32));
+  uint32_t const y = round((lat + 90.0) / 180.0 * (1LL << 32));
   uint64_t const code = bits::BitwiseMerge(y, x);
   string osmUrl = "https://osm.org/go/";
 
diff --git a/tracking/archive.hpp b/tracking/archive.hpp
index 1dec657cf4..38226727c1 100644
--- a/tracking/archive.hpp
+++ b/tracking/archive.hpp
@@ -22,15 +22,13 @@
 #include <utility>
 #include <vector>
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wdeprecated-copy"
 #endif
-
 #include <boost/circular_buffer.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic pop
 #endif
 
 namespace
diff --git a/tracking/connection.hpp b/tracking/connection.hpp
index 5263fdba92..98dc034aaa 100644
--- a/tracking/connection.hpp
+++ b/tracking/connection.hpp
@@ -6,15 +6,13 @@
 #include <memory>
 #include <string>
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wdeprecated-copy"
 #endif
-
 #include <boost/circular_buffer.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic pop
 #endif
 
 namespace platform { class Socket; }
diff --git a/tracking/protocol.hpp b/tracking/protocol.hpp
index 9d72c7dd3a..4402a73a3c 100644
--- a/tracking/protocol.hpp
+++ b/tracking/protocol.hpp
@@ -7,15 +7,13 @@
 #include <utility>
 #include <vector>
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wdeprecated-copy"
 #endif
-
 #include <boost/circular_buffer.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic pop
 #endif
 
 namespace tracking
diff --git a/tracking/reporter.hpp b/tracking/reporter.hpp
index 5b588cb9ef..e8ad1bdbe2 100644
--- a/tracking/reporter.hpp
+++ b/tracking/reporter.hpp
@@ -16,15 +16,13 @@
 #include <string>
 #include <vector>
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-copy"
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wdeprecated-copy"
 #endif
-
 #include <boost/circular_buffer.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
+#if defined(__clang__) and !defined(__ANDROID__)
+  #pragma clang diagnostic pop
 #endif
 
 namespace location