diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index a65ddb524b..08afe207b9 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -267,6 +267,7 @@ bool Editor::Save(string const & fullFilePath) const
     for (auto const & index : mwm.second)
     {
       FeatureTypeInfo const & fti = index.second;
+      // TODO: Do we really need to serialize deleted features in full details? Looks like mwm ID and meta fields are enough.
       XMLFeature xf = fti.m_feature.ToXML();
       xf.SetMWMFeatureIndex(index.first);
       if (!fti.m_street.empty())
diff --git a/indexer/rank_table.cpp b/indexer/rank_table.cpp
index 8e88f8549f..3d9d6300fd 100644
--- a/indexer/rank_table.cpp
+++ b/indexer/rank_table.cpp
@@ -129,7 +129,7 @@ public:
   uint8_t Get(uint64_t i) const override
   {
     // i can be greater than Size() for features created by user in the Editor.
-    // TODO(vng): Is there a better way inject it? Without this check search engine crashes here.
+    // May be there is a better way to inject this code. Without this check search engine crashes here.
     //ASSERT_LESS(i, Size(), ());
     if (i >= Size())
       return 0;