diff --git a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_cylinder_fit_region.h b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_cylinder_fit_region.h
index 367718bd61b..cb742abd68b 100644
--- a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_cylinder_fit_region.h
+++ b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_cylinder_fit_region.h
@@ -361,7 +361,7 @@ namespace Point_set {
       FT radius; Line_3 axis;
       std::tie(radius, axis) = internal::create_cylinder(
         region, m_point_map, m_normal_map,
-        m_traits, false).first;
+        m_traits).first;
 
       if (radius >= FT(0)) {
         m_radius = radius;
@@ -379,7 +379,7 @@ namespace Point_set {
       const Region& region) const {
       return internal::create_cylinder(
         region, m_point_map, m_normal_map,
-        m_traits, false).first;
+        m_traits).first;
     }
     /// \endcond
 
diff --git a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_cylinder_fit_sorting.h b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_cylinder_fit_sorting.h
index 6b9a0c17cf8..f22731167af 100644
--- a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_cylinder_fit_sorting.h
+++ b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Point_set/Least_squares_cylinder_fit_sorting.h
@@ -202,7 +202,7 @@ namespace Point_set {
         neighbors.push_back(it);
 
         m_scores[idx] = -internal::create_cylinder(
-          neighbors, m_point_map, m_normal_map, m_traits, true).second;
+          neighbors, m_point_map, m_normal_map, m_traits).second;
 
         if (m_scores[idx] == -(std::numeric_limits<double>::max)())
           seed_cutoff++;
diff --git a/Shape_detection/include/CGAL/Shape_detection/Region_growing/internal/utils.h b/Shape_detection/include/CGAL/Shape_detection/Region_growing/internal/utils.h
index 75dd9c3ca47..3839f02e647 100644
--- a/Shape_detection/include/CGAL/Shape_detection/Region_growing/internal/utils.h
+++ b/Shape_detection/include/CGAL/Shape_detection/Region_growing/internal/utils.h
@@ -62,11 +62,7 @@ namespace internal {
   };
 
   template<typename Input, typename Result, bool = std::is_same<Input, Result>::value >
-  struct conditional_deref {
-    Result operator()(Input it) {
-      assert(false);
-    }
-  };
+  struct conditional_deref;
 
   template<typename Input, typename Result>
   struct conditional_deref<Input, Result, true> {
@@ -655,7 +651,7 @@ namespace internal {
     create_cylinder(
       const Region& region, const PointMap point_map,
       const NormalMap normal_map,
-      const Traits& traits, const bool compute_score) {
+      const Traits& traits) {
 
     if (region.size() < 6)
       return std::make_pair(