diff --git a/ApplicationLibCode/ModelVisualization/Intersections/RivPolylineIntersectionGeometryGenerator.cpp b/ApplicationLibCode/ModelVisualization/Intersections/RivPolylineIntersectionGeometryGenerator.cpp
index 48e2ef0b96..6c4d0b9194 100644
--- a/ApplicationLibCode/ModelVisualization/Intersections/RivPolylineIntersectionGeometryGenerator.cpp
+++ b/ApplicationLibCode/ModelVisualization/Intersections/RivPolylineIntersectionGeometryGenerator.cpp
@@ -28,8 +28,6 @@
 #include "cvfPlane.h"
 #include "cvfVertexWelder.h"
 
-#pragma optimize( "", off )
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -81,10 +79,10 @@ const cvf::Vec3fArray* RivPolylineIntersectionGeometryGenerator::triangleVxes()
 //--------------------------------------------------------------------------------------------------
 const std::vector<RivIntersectionVertexWeights>& RivPolylineIntersectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const
 {
+    // Not implemented - not in use
     CVF_ASSERT( false );
 
-    // Not implemented error
-    return {};
+    return m_emptyTriVxToCellCornerWeights;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ModelVisualization/Intersections/RivPolylineIntersectionGeometryGenerator.h b/ApplicationLibCode/ModelVisualization/Intersections/RivPolylineIntersectionGeometryGenerator.h
index a1d63b47ee..d32d651e01 100644
--- a/ApplicationLibCode/ModelVisualization/Intersections/RivPolylineIntersectionGeometryGenerator.h
+++ b/ApplicationLibCode/ModelVisualization/Intersections/RivPolylineIntersectionGeometryGenerator.h
@@ -82,4 +82,7 @@ private:
     std::vector<size_t>       m_polygonToCellIdxMap;
     cvf::ref<cvf::Vec3fArray> m_polygonVertices;
     std::vector<size_t>       m_verticesPerPolygon;
+
+    // Dummy vectors for GeomGen Interface
+    const std::vector<RivIntersectionVertexWeights> m_emptyTriVxToCellCornerWeights = {};
 };
diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
index 23c3a30e83..80a74c8e9e 100644
--- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
@@ -128,8 +128,6 @@
 
 #include <climits>
 
-#pragma optimize( "", off )
-
 CAF_PDM_XML_SOURCE_INIT( RimEclipseView, "ReservoirView" );
 //--------------------------------------------------------------------------------------------------
 ///
diff --git a/GrpcInterface/RiaGrpcGridGeometryExtractionService.cpp b/GrpcInterface/RiaGrpcGridGeometryExtractionService.cpp
index eb29fe5154..4d5d3f477c 100644
--- a/GrpcInterface/RiaGrpcGridGeometryExtractionService.cpp
+++ b/GrpcInterface/RiaGrpcGridGeometryExtractionService.cpp
@@ -55,8 +55,6 @@
 #include "qfileinfo.h"
 #include "qstring.h"
 
-#pragma optimize( "", off )
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------