diff --git a/include/boost/geometry/index/detail/predicates.hpp b/include/boost/geometry/index/detail/predicates.hpp
index fd5a92796..b92256649 100644
--- a/include/boost/geometry/index/detail/predicates.hpp
+++ b/include/boost/geometry/index/detail/predicates.hpp
@@ -64,12 +64,11 @@ struct spatial_predicate
 
 // ------------------------------------------------------------------ //
 
-// TODO
-// may be replaced by
-// nearest_predicate<Geometry>
-//   Geometry geometry
-//   unsigned count
-// + point_tag, path_tag
+// CONSIDER: separated nearest<> and path<> may be replaced by
+//           nearest_predicate<Geometry, Tag>
+//           where Tag = point_tag | path_tag
+// IMPROVEMENT: user-defined nearest predicate allowing to define
+//              all or only geometrical aspects of the search
 
 template <typename PointOrRelation>
 struct nearest
diff --git a/include/boost/geometry/index/parameters.hpp b/include/boost/geometry/index/parameters.hpp
index 2516e6d71..fd6df716e 100644
--- a/include/boost/geometry/index/parameters.hpp
+++ b/include/boost/geometry/index/parameters.hpp
@@ -20,7 +20,6 @@ namespace detail {
 template <size_t MaxElements>
 struct default_min_elements_s
 {
-    // TODO - assert MaxElements <= (std::numeric_limits<size_t>::max)()/3
     static const size_t raw_value = (MaxElements * 3) / 10;
     static const size_t value = 1 <= raw_value ? raw_value : 1;
 };
@@ -34,7 +33,6 @@ inline size_t default_min_elements_d_calc(size_t max_elements, size_t min_elemen
 {
     if ( default_min_elements_d() == min_elements )
     {
-        // TODO - assert MaxElements <= (std::numeric_limits<size_t>::max)()/3
         size_t raw_value = (max_elements * 3) / 10;
         return 1 <= raw_value ? raw_value : 1;
     }
@@ -45,7 +43,6 @@ inline size_t default_min_elements_d_calc(size_t max_elements, size_t min_elemen
 template <size_t MaxElements>
 struct default_rstar_reinserted_elements_s
 {
-    // TODO - assert MaxElements <= (std::numeric_limits<size_t>::max)()/3
     static const size_t value = (MaxElements * 3) / 10;
 };
 
@@ -58,7 +55,6 @@ inline size_t default_rstar_reinserted_elements_d_calc(size_t max_elements, size
 {
     if ( default_rstar_reinserted_elements_d() == reinserted_elements )
     {
-        // TODO - assert MaxElements <= (std::numeric_limits<size_t>::max)()/3
         return (max_elements * 3) / 10;
     }