diff --git a/DirectXTex/BC6HBC7.cpp b/DirectXTex/BC6HBC7.cpp
index f87dc63..4b815be 100644
--- a/DirectXTex/BC6HBC7.cpp
+++ b/DirectXTex/BC6HBC7.cpp
@@ -1180,7 +1180,6 @@ namespace
 
 
     //-------------------------------------------------------------------------------------
-    template<bool ishdr>
     float OptimizeRGB(
         _In_reads_(NUM_PIXELS_PER_BLOCK) const HDRColorA* const pPoints,
         _Out_ HDRColorA* pX,
@@ -1194,21 +1193,8 @@ namespace
         const float *pD = (3 == cSteps) ? pD3 : pD4;
 
         // Find Min and Max points, as starting point
-        HDRColorA X, Y;
-#if (__cplusplus >= 201703L)
-        if constexpr (ishdr)
-#else
-        if (ishdr)
-#endif
-        {
-            X = HDRColorA{ FLT_MAX, FLT_MAX, FLT_MAX, 0.0f };
-            Y = HDRColorA{ -FLT_MAX, -FLT_MAX, -FLT_MAX, 0.0f };
-        }
-        else
-        {
-            X = HDRColorA{ 1.0f, 1.0f, 1.0f, 0.0f };
-            Y = HDRColorA{ 0.0f, 0.0f, 0.0f, 0.0f };
-        }
+        HDRColorA X(FLT_MAX, FLT_MAX, FLT_MAX, 0.0f);
+        HDRColorA Y(-FLT_MAX, -FLT_MAX, -FLT_MAX, 0.0f);
 
         for (size_t iPoint = 0; iPoint < cPixels; iPoint++)
         {
@@ -2506,7 +2492,7 @@ float D3DX_BC6H::RoughMSE(EncodeParams* pEP) const noexcept
         }
 
         HDRColorA epA, epB;
-        OptimizeRGB<true>(pEP->aHDRPixels, &epA, &epB, 4, np, auPixIdx);
+        OptimizeRGB(pEP->aHDRPixels, &epA, &epB, 4, np, auPixIdx);
         aEndPts[p].A.Set(epA, pEP->bSigned);
         aEndPts[p].B.Set(epB, pEP->bSigned);
         if (pEP->bSigned)
@@ -3478,7 +3464,7 @@ float D3DX_BC7::RoughMSE(EncodeParams* pEP, size_t uShape, size_t uIndexMode) no
             }
 
             HDRColorA epA, epB;
-            OptimizeRGB<false>(pEP->aHDRPixels, &epA, &epB, 4, np, auPixIdx);
+            OptimizeRGB(pEP->aHDRPixels, &epA, &epB, 4, np, auPixIdx);
             epA.Clamp(0.0f, 1.0f);
             epB.Clamp(0.0f, 1.0f);
             epA *= 255.0f;