diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 909fde800b..28d4552b57 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -185,7 +185,6 @@ Bookmark * BookmarkManager::CreateBookmark(m2::PointD const & ptOrg, BookmarkDat
 
 Bookmark * BookmarkManager::CreateBookmark(m2::PointD const & ptOrg, BookmarkData & bm, df::MarkGroupID groupId)
 {
-  // TODO(darina): Do we need this event?
   GetPlatform().GetMarketingService().SendMarketingEvent(marketing::kBookmarksBookmarkAction,
                                                          {{"action", "create"}});
 
@@ -898,7 +897,6 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool
     }
     if (merge)
     {
-      // TODO(darina): Change the order.
       // Delete file since it will be merged.
       my::DeleteFileX(data->m_file);
       SaveToKMLFile(groupId);
diff --git a/map/user_mark.cpp b/map/user_mark.cpp
index 2476b3cb67..dfc3bc6c63 100644
--- a/map/user_mark.cpp
+++ b/map/user_mark.cpp
@@ -17,7 +17,7 @@ df::MarkID GetNextUserMarkId(UserMark::Type type)
 {
   static std::atomic<uint32_t> nextMarkId(0);
 
-  ASSERT_LESS(type, 1 << kMarkIdTypeBitsCount, ());
+  static_assert(UserMark::Type::BOOKMARK < (1 << kMarkIdTypeBitsCount), "Not enough bits for user mark type.");
   return static_cast<df::MarkID>(
     (++nextMarkId) | (type << static_cast<uint32_t>(sizeof(df::MarkID) * 8 - kMarkIdTypeBitsCount)));
 }