diff --git a/Octree/include/CGAL/Octree.h b/Octree/include/CGAL/Octree.h
index 8a2881ac761..127fadf1578 100644
--- a/Octree/include/CGAL/Octree.h
+++ b/Octree/include/CGAL/Octree.h
@@ -36,7 +36,6 @@
 #include <CGAL/Search_traits_adapter.h>
 
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/range/iterator_range.hpp>
 
diff --git a/Octree/test/Octree/test_nearest_neighbor.cpp b/Octree/test/Octree/test_nearest_neighbor.cpp
index bf102a1616a..c3dbd9650ee 100644
--- a/Octree/test/Octree/test_nearest_neighbor.cpp
+++ b/Octree/test/Octree/test_nearest_neighbor.cpp
@@ -66,7 +66,7 @@ void naive_vs_accelerated(std::size_t dataset_size) {
   Point octree_nearest = *generator;
   auto octree_start_time = high_resolution_clock::now();
   {
-
+    // TODO: Write a nearest-neighbor implementation and use it here
   }
   duration<float> octree_elapsed_time = high_resolution_clock::now() - octree_start_time;