diff --git a/Eigen/Core b/Eigen/Core
index ab6cec5e2..190832398 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -222,7 +222,6 @@ inline static const char *SimdInstructionSetsInUse(void) {
 }
 
 #define STAGE10_FULL_EIGEN2_API             10
-#define STAGE15_RESOLVE_API_CONFLICTS_WARN  15
 #define STAGE20_RESOLVE_API_CONFLICTS       20
 #define STAGE30_FULL_EIGEN3_API             30
 #define STAGE40_FULL_EIGEN3_STRICTNESS      40
@@ -237,9 +236,6 @@ inline static const char *SimdInstructionSetsInUse(void) {
 #elif defined EIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS
   #define EIGEN2_SUPPORT
   #define EIGEN2_SUPPORT_STAGE STAGE20_RESOLVE_API_CONFLICTS
-#elif defined EIGEN2_SUPPORT_STAGE15_RESOLVE_API_CONFLICTS_WARN
-  #define EIGEN2_SUPPORT
-  #define EIGEN2_SUPPORT_STAGE STAGE15_RESOLVE_API_CONFLICTS_WARN
 #elif defined EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API
   #define EIGEN2_SUPPORT
   #define EIGEN2_SUPPORT_STAGE STAGE10_FULL_EIGEN2_API
diff --git a/Eigen/src/Core/Dot.h b/Eigen/src/Core/Dot.h
index 837738308..6e83191c5 100644
--- a/Eigen/src/Core/Dot.h
+++ b/Eigen/src/Core/Dot.h
@@ -90,9 +90,7 @@ MatrixBase<Derived>::dot(const MatrixBase<OtherDerived>& other) const
 /** \returns the dot product of *this with other, with the Eigen2 convention that the dot product is linear in the first variable
   * (conjugating the second variable). Of course this only makes a difference in the complex case.
   *
-  * This method is only available in EIGEN2_SUPPORT mode. With EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API and
-  * EIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS, the dot() method itself uses it. With EIGEN2_SUPPORT_STAGE30_FULL_EIGEN3_API,
-  * the dot() method no longer uses it, but it's still available.
+  * This method is only available in EIGEN2_SUPPORT mode.
   *
   * \only_for_vectors
   *
diff --git a/Eigen/src/Eigen2Support/Geometry/All.h b/Eigen/src/Eigen2Support/Geometry/All.h
index 7b076806b..9d8244b07 100644
--- a/Eigen/src/Eigen2Support/Geometry/All.h
+++ b/Eigen/src/Eigen2Support/Geometry/All.h
@@ -7,7 +7,6 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-
 #if EIGEN2_SUPPORT_STAGE < STAGE20_RESOLVE_API_CONFLICTS
 #include "RotationBase.h"
 #include "Rotation2D.h"