diff --git a/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h b/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
index 388525d77be..689aa4ba254 100644
--- a/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
+++ b/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
@@ -443,7 +443,7 @@ put(boost::vertex_point_t p, OpenMesh::PolyMesh_ArrayKernelT<K>& g,
 
 
 namespace boost {
-#if 1
+
 template <typename K, typename V>
 struct dynamic_property_map<OpenMesh::PolyMesh_ArrayKernelT<K>, boost::vertex_property_t<V> >
 {
@@ -479,10 +479,10 @@ struct dynamic_property_map<OpenMesh::PolyMesh_ArrayKernelT<K>, boost::face_prop
   typedef CGAL::OM_pmap<SM,face_descriptor, V> type;
   typedef type const_type;
 };
-#endif
+
 } // namespace boost
 
-#if 1
+
 namespace CGAL {
   namespace internal {
 template <typename K, typename V>
@@ -528,6 +528,6 @@ void remove(Pmap pm, OpenMesh::PolyMesh_ArrayKernelT<K>& om)
 }
 } // namespace internal
 } // namespace CGAL
-#endif
+
 
 #endif /* CGAL_PROPERTIES_POLYMESH_ARRAYKERNELT_H */
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test_P_SM_OM.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test_P_SM_OM.cpp
index a4ffc02aa13..8ec9606f587 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test_P_SM_OM.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test_P_SM_OM.cpp
@@ -17,7 +17,6 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Epic;
 
 int main()
 {
-#if 1
   {
     typedef CGAL::Surface_mesh<typename Epic::Point_3> SM;
     SM sm;
@@ -30,7 +29,7 @@ int main()
     std::ofstream out("sm.off");
     out << sm << std::endl;
   }
-#endif
+
   {
   typedef CGAL::Polyhedron_3<Epic> P;
   std::map<boost::graph_traits<P>::face_descriptor, std::size_t> fim;
@@ -45,7 +44,6 @@ int main()
     out << p << std::endl;
   }
 
-#if 0
   {
     typedef OpenMesh::PolyMesh_ArrayKernelT</* MyTraits*/> OM;
 
@@ -61,6 +59,6 @@ int main()
     om.garbage_collection();
     OpenMesh::IO::write_mesh(om, "om.off");
   }
-#endif
+
   return 0;
 }
diff --git a/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h b/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h
index 261eeb9913f..f9b9aef2980 100644
--- a/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h
+++ b/Polyhedron/include/CGAL/boost/graph/properties_Polyhedron_3.h
@@ -485,44 +485,6 @@ struct graph_has_property<CGAL::Polyhedron_3<Gt, I, HDS, A>, vertex_index_t>
     >
 {};
 
-#if 0
-template <class Gt, class I, CGAL_HDS_PARAM_, class A, typename T>
-struct dynamic_property_map<CGAL::Polyhedron_3<Gt, I, HDS, A>, boost::vertex_property_t<T> >
-{
-  typedef CGAL::Polyhedron_3<Gt, I, HDS, A> SM;
-  typedef typename boost::graph_traits<SM>::vertex_descriptor vertex_descriptor;
-  typedef CGAL::internal::Dynamic_property_map<vertex_descriptor,T> type;
-  typedef type const_type;
-};
-
-template <class Gt, class I, CGAL_HDS_PARAM_, class A, typename T>
-struct dynamic_property_map<CGAL::Polyhedron_3<Gt, I, HDS, A>, boost::halfedge_property_t<T> >
-{
-  typedef CGAL::Polyhedron_3<Gt, I, HDS, A> SM;
-  typedef typename boost::graph_traits<SM>::halfedge_descriptor halfedge_descriptor;
-  typedef CGAL::internal::Dynamic_property_map<halfedge_descriptor,T> type;
-  typedef type const_type;
-};
-
-template <class Gt, class I, CGAL_HDS_PARAM_, class A, typename T>
-struct dynamic_property_map<CGAL::Polyhedron_3<Gt, I, HDS, A>, boost::edge_property_t<T> >
-{
-  typedef CGAL::Polyhedron_3<Gt, I, HDS, A> SM;
-  typedef typename boost::graph_traits<SM>::edge_descriptor edge_descriptor;
-  typedef CGAL::internal::Dynamic_property_map<edge_descriptor,T> type;
-  typedef type const_type;
-};
-
-template <class Gt, class I, CGAL_HDS_PARAM_, class A, typename T>
-struct dynamic_property_map<CGAL::Polyhedron_3<Gt, I, HDS, A>, boost::face_property_t<T> >
-{
-  typedef CGAL::Polyhedron_3<Gt, I, HDS, A> SM;
-  typedef typename boost::graph_traits<SM>::face_descriptor face_descriptor;
-  typedef CGAL::internal::Dynamic_property_map<face_descriptor,T> type;
-  typedef type const_type;
-};
-#endif
-
 } // namespace boost