diff --git a/BGL/include/CGAL/boost/parameter.h b/BGL/include/CGAL/boost/parameter.h
index 851fa3e8d39..83cc6384577 100644
--- a/BGL/include/CGAL/boost/parameter.h
+++ b/BGL/include/CGAL/boost/parameter.h
@@ -14,15 +14,6 @@
 
 #include <CGAL/config.h>
 
-
-#ifdef BOOST_PARAMETER_MAX_ARITY
-#  if (BOOST_PARAMETER_MAX_ARITY < 12)
-#    error "BOOST_PARAMETER_MAX_ARITY must be at least 12 for CGAL::Mesh_3"
-#  endif
-#else
-#  define  BOOST_PARAMETER_MAX_ARITY 12
-#endif
-
 #include <boost/parameter/name.hpp>
 
 #if defined(__clang__) || defined(BOOST_GCC)
diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h
index a2d01e9293a..7d7d435a302 100644
--- a/Installation/include/CGAL/config.h
+++ b/Installation/include/CGAL/config.h
@@ -112,17 +112,6 @@
 #endif
 #endif
 
-// Macro used by Boost Parameter. Mesh_3 needs at least 12, before the
-// Boost Parameter headers are included: <boost/parameter/config.hpp>
-// defines the value to 8, if it is not yet defined.
-// The CGAL BGL properties mechanism includes
-// <boost/graph/named_function_params.hpp>, that includes
-// <boost/parameter/name.hpp>, and maybe other Boost libraries may use
-// Boost Parameter as well.
-// That is why that is important to define that macro as early as possible,
-// in <CGAL/config.h>
-#define BOOST_PARAMETER_MAX_ARITY 12
-
 // The following header file defines among other things  BOOST_PREVENT_MACRO_SUBSTITUTION
 #include <boost/config.hpp>
 #include <boost/version.hpp>
diff --git a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
index ccd6e94e60b..837c17414fd 100644
--- a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
@@ -543,7 +543,7 @@ where the labeled image is used with a precomputed 3D image of weights :
             auto null_subdomain_index_ = choose_parameter(get_parameter(np, internal_np::null_subdomain_index_param), Null_functor());
             auto construct_surface_patch_index_ = choose_parameter(get_parameter(np, internal_np::surface_patch_index), Null_functor());
             CGAL::Image_3 weights_ = choose_parameter(get_parameter(np, internal_np::weights_param), CGAL::Image_3());
-
+            CGAL_USE(iso_value_);
             namespace p = CGAL::parameters;
             if (weights_.is_valid())
             {
diff --git a/Mesh_3/include/CGAL/Mesh_criteria_3.h b/Mesh_3/include/CGAL/Mesh_criteria_3.h
index d06e8d64e35..8c4ed59c305 100644
--- a/Mesh_3/include/CGAL/Mesh_criteria_3.h
+++ b/Mesh_3/include/CGAL/Mesh_criteria_3.h
@@ -170,8 +170,6 @@ public:
 
          \param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below:
 
-         The following are optional named parameters.
-
          \cgalNamedParamsBegin
            \cgalParamNBegin{edge_size}
              \cgalParamDescription{a scalar field (resp. a constant) providing a space varying
diff --git a/Polyhedron/demo/Polyhedron/C3t3_type.h b/Polyhedron/demo/Polyhedron/C3t3_type.h
index d666f6546b5..c9f890b6eac 100644
--- a/Polyhedron/demo/Polyhedron/C3t3_type.h
+++ b/Polyhedron/demo/Polyhedron/C3t3_type.h
@@ -3,8 +3,6 @@
 
 #include "config.h"
 #include "Plugins/Mesh_3/config_mesh_3.h"
-
-// include this to get #define BOOST_PARAMETER_MAX_ARITY 12
 // as otherwise it gets set via inclusion of Polyhedron_3.h
 #include <CGAL/boost/parameter.h>
 #include <CGAL/Default.h>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp
index 87fd4b7c529..f289245a996 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp
@@ -2,7 +2,6 @@
 // Needed for lloyd_optimize_mesh_2 which does it too late
 // (and we don't want to spend the time on finding out who
 // includes the header file that sets it too a value too low
-#define  BOOST_PARAMETER_MAX_ARITY 12
 
 #include <stdexcept>
 
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/config_mesh_3.h b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/config_mesh_3.h
index 50aa90773b8..482e1f323fc 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/config_mesh_3.h
+++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/config_mesh_3.h
@@ -1,8 +1,6 @@
 #ifndef CGAL_DEMO_MESH_3_CONFIG_H
 #define CGAL_DEMO_MESH_3_CONFIG_H
 
-#define  BOOST_PARAMETER_MAX_ARITY 12
-
 // CGAL_MESH_3_PROTECTION_DEBUG:
 // -  1 : display debug messages
 // -  2 : dump file `polylines_graph.polylines.txt` and