diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
index 29586862b45..7166b347780 100644
--- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
+++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
@@ -68,8 +68,9 @@ and provides a list of the parameters that are used in this package.
 - \link stitching_grp `CGAL::Polygon_mesh_processing::stitch_borders()` \endlink
 - `CGAL::Polygon_mesh_processing::polygon_soup_to_polygon_mesh()`
 - `CGAL::Polygon_mesh_processing::orient_polygon_soup()`
+<!---
 - \link reverse_face_orientations_grp `CGAL::Polygon_mesh_processing::remove_degenerate_faces()` \endlink
-
+--->
 ## Normal Computation Functions ##
 - `CGAL::Polygon_mesh_processing::compute_face_normal()`
 - `CGAL::Polygon_mesh_processing::compute_face_normals()`
@@ -93,4 +94,5 @@ It can be made short to PM. And TriangleMesh (or TM) specifies when the paramete
 \todo document `BGL/include/CGAL/boost/graph/split_graph_into_polylines.h`
 \todo add in BGL `clear(pmesh)` and use it in `keep_largest_connected_components(pmesh, 0);`
 \todo document BGL/include/CGAL/boost/graph/Dual.h and remove the example from dont_submit
+\todo fix and restore remove_degenerate_faces in the user and the reference manual
 */
diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
index eb43164526b..4a8c4e12d4e 100644
--- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
+++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
@@ -260,6 +260,7 @@ with duplicated border edges.
 \cgalExample{Polygon_mesh_processing/stitch_borders_example.cpp}
 
 *******************
+<!---
 \subsection DegenerateFaces Removing Degenerate Faces
 
 Some degenerate faces may be part of a given triangle mesh.
@@ -277,7 +278,7 @@ are removed, the connectivity is fixed, and the number of removed faces
 is output.
 
 \cgalExample{Polygon_mesh_processing/remove_degeneracies_example.cpp}
-
+--->
 
 *******************
 \subsection PolygonSoups Polygon Soups
@@ -445,7 +446,6 @@ Function or Class                     | Pure Triangle  | Self-Intersection Free
 `stitch_borders()`                    |     no         |        no              |   no
 `polygon_soup_to_polygon_mesh()`      |     no         |        no              |   no
 `orient_polygon_soup()`               |     no         |        no              |   no
-`remove_degenerate_faces()`           |     yes        |        no              |   no
 `compute_face_normal()`               |     no         |        no              |   no
 `compute_face_normals()`              |     no         |        no              |   no
 `compute_vertex_normal()`             |     no         |        no              |   no
@@ -458,6 +458,9 @@ Function or Class                     | Pure Triangle  | Self-Intersection Free
 `keep_connected_components()`         |     no         |        no              |   no
 `remove_connected_components()`       |     no         |        no              |   no
 </center>
+<!---
+`remove_degenerate_faces()`           |     yes        |        no              |   no
+--->
 ****************************************
 \section PMPHistory Implementation History
 
diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt
index a2dfeb51fe6..edb3b337e9e 100644
--- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt
+++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt
@@ -11,6 +11,5 @@
 \example Polygon_mesh_processing/triangulate_polyline_example.cpp
 \example Polygon_mesh_processing/refine_fair_example.cpp
 \example Polygon_mesh_processing/mesh_slicer_example.cpp
-\example Polygon_mesh_processing/remove_degeneracies_example.cpp
 
 */
diff --git a/Polygon_mesh_processing/dont_submit b/Polygon_mesh_processing/dont_submit
new file mode 100644
index 00000000000..9ee49f9ce2d
--- /dev/null
+++ b/Polygon_mesh_processing/dont_submit
@@ -0,0 +1,2 @@
+examples/Polygon_mesh_processing/remove_degeneracies_example.cpp
+examples/Polygon_mesh_processing/remove_degeneracies_example_OM.cpp
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h
index 851f6a6ff77..0beb2704097 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h
@@ -140,7 +140,7 @@ bool is_degenerated(
   return is_degenerated(halfedge(fd,tmesh), tmesh, vpmap, traits);
 }
 
-
+///\cond SKIP_IN_MANUAL
 template <class EdgeRange, class TriangleMesh, class NamedParameters>
 std::size_t remove_null_edges(
                        const EdgeRange& edge_range,
@@ -464,7 +464,7 @@ std::size_t remove_null_edges(
 /// \cgalNamedParamsEnd
 ///
 /// \return number of removed degenerate faces
-///
+/// \endcond
 template <class TriangleMesh, class NamedParameters>
 std::size_t remove_degenerate_faces(TriangleMesh& tmesh,
                                     const NamedParameters& np)