diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm
index a445c6e7e4..288e075772 100644
--- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm
@@ -302,9 +302,7 @@ extern NSString * const kBookmarkCategoryDeletedNotification =
   return NO;
 }
 
-#pragma mark : - MWMBookmarksObserver
+#pragma mark - MWMBookmarksObserver
 - (void)onBookmarksLoadFinished { [self.tableView reloadData]; }
 
-- (void)onBookmarksFileLoadSuccess { [self.tableView reloadData]; }
-
 @end
diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
index a563467bf0..263eeab0d4 100644
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
@@ -62,10 +62,7 @@ using TLoopBlock = void (^)(Observer observer);
   {
     __weak auto wSelf = self;
     bookmarkCallbacks.m_onStarted = [wSelf]() {
-      __strong auto self = wSelf;
-      if (!self)
-        return;
-      self.areBookmarksLoaded = NO;
+      wSelf.areBookmarksLoaded = NO;
     };
   }
   {
@@ -76,8 +73,7 @@ using TLoopBlock = void (^)(Observer observer);
         return;
       self.areBookmarksLoaded = YES;
       [self loopObservers:^(Observer observer) {
-        if ([observer respondsToSelector:@selector(onBookmarksLoadFinished)])
-          [observer onBookmarksLoadFinished];
+        [observer onBookmarksLoadFinished];
       }];
     };
   }
diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksObserver.h b/iphone/Maps/Core/Bookmarks/MWMBookmarksObserver.h
index 4c1ce6371a..9e74f23398 100644
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksObserver.h
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksObserver.h
@@ -1,7 +1,8 @@
 @protocol MWMBookmarksObserver<NSObject>
 
-@optional
 - (void)onBookmarksLoadFinished;
+
+@optional
 - (void)onBookmarksFileLoadSuccess;
 
 @end