diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
index e6f4a466b1..3c5bc0ae65 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C
@@ -113,13 +113,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::PatchToPatchInterpolation
     fromPatch_(fromPatch),
     toPatch_(toPatch),
     alg_(alg),
-    dir_(dir),
-    pointAddressingPtr_(nullptr),
-    pointWeightsPtr_(nullptr),
-    pointDistancePtr_(nullptr),
-    faceAddressingPtr_(nullptr),
-    faceWeightsPtr_(nullptr),
-    faceDistancePtr_(nullptr)
+    dir_(dir)
 {}
 
 
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index 3a1a5bc0db..8830d3dd65 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
@@ -150,9 +150,7 @@ Foam::PrimitivePatchInterpolation<Patch>::PrimitivePatchInterpolation
     const Patch& p
 )
 :
-    patch_(p),
-    faceToPointWeightsPtr_(nullptr),
-    faceToEdgeWeightsPtr_(nullptr)
+    patch_(p)
 {}
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 55ac9b98fc..d51287b0f8 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1794,9 +1794,6 @@ void Foam::globalMeshData::calcGlobalCoPointSlaves() const
 Foam::globalMeshData::globalMeshData(const polyMesh& mesh)
 :
     mesh_(mesh),
-    globalMeshPointAddr_(),
-    globalMeshFaceAddr_(),
-    globalMeshCellAddr_(),
     processorTopology_
     (
         processorTopology::New<processorPolyPatch>
@@ -1805,16 +1802,8 @@ Foam::globalMeshData::globalMeshData(const polyMesh& mesh)
             mesh_.comm()
         )
     ),
-    processorPatches_(),
-    processorPatchIndices_(),
-    processorPatchNeighbours_(),
     nGlobalPoints_(-1),
-    sharedPointLabelsPtr_(nullptr),
-    sharedPointAddrPtr_(nullptr),
-    sharedPointGlobalLabelsPtr_(nullptr),
-    nGlobalEdges_(-1),
-    sharedEdgeLabelsPtr_(nullptr),
-    sharedEdgeAddrPtr_(nullptr)
+    nGlobalEdges_(-1)
 {
     updateMesh();
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index ea17e4c706..9ceb85a37e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -247,8 +247,6 @@ Foam::polyMesh::polyMesh(const IOobject& io, const bool doInit)
     comm_(UPstream::worldComm),
     geometricD_(Zero),
     solutionD_(Zero),
-    tetBasePtIsPtr_(nullptr),
-    cellTreePtr_(nullptr),
     pointZones_
     (
         IOobject
@@ -291,13 +289,10 @@ Foam::polyMesh::polyMesh(const IOobject& io, const bool doInit)
         *this,
         PtrList<entry>()
     ),
-    globalMeshDataPtr_(nullptr),
     moving_(false),
     topoChanging_(false),
     storeOldCellCentres_(false),
-    curMotionTimeIndex_(time().timeIndex()),
-    oldPointsPtr_(nullptr),
-    oldCellCentresPtr_(nullptr)
+    curMotionTimeIndex_(time().timeIndex())
 {
     if (owner_.hasHeaderClass())
     {
@@ -454,8 +449,6 @@ Foam::polyMesh::polyMesh
     comm_(UPstream::worldComm),
     geometricD_(Zero),
     solutionD_(Zero),
-    tetBasePtIsPtr_(nullptr),
-    cellTreePtr_(nullptr),
     pointZones_
     (
         IOobject
@@ -498,13 +491,10 @@ Foam::polyMesh::polyMesh
         *this,
         Foam::zero{}
     ),
-    globalMeshDataPtr_(nullptr),
     moving_(false),
     topoChanging_(false),
     storeOldCellCentres_(false),
-    curMotionTimeIndex_(time().timeIndex()),
-    oldPointsPtr_(nullptr),
-    oldCellCentresPtr_(nullptr)
+    curMotionTimeIndex_(time().timeIndex())
 {
     // Check if the faces and cells are valid
     forAll(faces_, facei)
@@ -608,8 +598,6 @@ Foam::polyMesh::polyMesh
     comm_(UPstream::worldComm),
     geometricD_(Zero),
     solutionD_(Zero),
-    tetBasePtIsPtr_(nullptr),
-    cellTreePtr_(nullptr),
     pointZones_
     (
         IOobject
@@ -652,13 +640,10 @@ Foam::polyMesh::polyMesh
         *this,
         Foam::zero{}
     ),
-    globalMeshDataPtr_(nullptr),
     moving_(false),
     topoChanging_(false),
     storeOldCellCentres_(false),
-    curMotionTimeIndex_(time().timeIndex()),
-    oldPointsPtr_(nullptr),
-    oldCellCentresPtr_(nullptr)
+    curMotionTimeIndex_(time().timeIndex())
 {
     // Check if faces are valid
     forAll(faces_, facei)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 871713605b..82e5b9d60e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -524,8 +524,6 @@ Foam::polyMesh::polyMesh
     comm_(UPstream::worldComm),
     geometricD_(Zero),
     solutionD_(Zero),
-    tetBasePtIsPtr_(nullptr),
-    cellTreePtr_(nullptr),
     pointZones_
     (
         IOobject
@@ -568,13 +566,10 @@ Foam::polyMesh::polyMesh
         *this,
         Foam::zero{}
     ),
-    globalMeshDataPtr_(nullptr),
     moving_(false),
     topoChanging_(false),
     storeOldCellCentres_(false),
-    curMotionTimeIndex_(time().timeIndex()),
-    oldPointsPtr_(nullptr),
-    oldCellCentresPtr_(nullptr)
+    curMotionTimeIndex_(time().timeIndex())
 {
     DebugInfo
         << "Constructing polyMesh from cell and boundary shapes." << endl;
@@ -806,8 +801,6 @@ Foam::polyMesh::polyMesh
     comm_(UPstream::worldComm),
     geometricD_(Zero),
     solutionD_(Zero),
-    tetBasePtIsPtr_(nullptr),
-    cellTreePtr_(nullptr),
     pointZones_
     (
         IOobject
@@ -850,13 +843,10 @@ Foam::polyMesh::polyMesh
         *this,
         Foam::zero{}
     ),
-    globalMeshDataPtr_(nullptr),
     moving_(false),
     topoChanging_(false),
     storeOldCellCentres_(false),
-    curMotionTimeIndex_(time().timeIndex()),
-    oldPointsPtr_(nullptr),
-    oldCellCentresPtr_(nullptr)
+    curMotionTimeIndex_(time().timeIndex())
 {
     DebugInfo
         << "Constructing polyMesh from cell and boundary shapes." << endl;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
index 6c401211ad..270ea43242 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
@@ -39,25 +39,7 @@ Foam::PrimitivePatch<FaceList, PointField>::PrimitivePatch
 :
     FaceList(faces),
     points_(points),
-    edgesPtr_(nullptr),
-    nInternalEdges_(-1),
-    boundaryPointsPtr_(nullptr),
-    faceFacesPtr_(nullptr),
-    edgeFacesPtr_(nullptr),
-    faceEdgesPtr_(nullptr),
-    pointEdgesPtr_(nullptr),
-    pointFacesPtr_(nullptr),
-    localFacesPtr_(nullptr),
-    meshPointsPtr_(nullptr),
-    meshPointMapPtr_(nullptr),
-    edgeLoopsPtr_(nullptr),
-    localPointsPtr_(nullptr),
-    localPointOrderPtr_(nullptr),
-    faceCentresPtr_(nullptr),
-    faceAreasPtr_(nullptr),
-    magFaceAreasPtr_(nullptr),
-    faceNormalsPtr_(nullptr),
-    pointNormalsPtr_(nullptr)
+    nInternalEdges_(-1)
 {}
 
 
@@ -70,25 +52,7 @@ Foam::PrimitivePatch<FaceList, PointField>::PrimitivePatch
 :
     FaceList(std::move(faces)),
     points_(points),
-    edgesPtr_(nullptr),
-    nInternalEdges_(-1),
-    boundaryPointsPtr_(nullptr),
-    faceFacesPtr_(nullptr),
-    edgeFacesPtr_(nullptr),
-    faceEdgesPtr_(nullptr),
-    pointEdgesPtr_(nullptr),
-    pointFacesPtr_(nullptr),
-    localFacesPtr_(nullptr),
-    meshPointsPtr_(nullptr),
-    meshPointMapPtr_(nullptr),
-    edgeLoopsPtr_(nullptr),
-    localPointsPtr_(nullptr),
-    localPointOrderPtr_(nullptr),
-    faceCentresPtr_(nullptr),
-    faceAreasPtr_(nullptr),
-    magFaceAreasPtr_(nullptr),
-    faceNormalsPtr_(nullptr),
-    pointNormalsPtr_(nullptr)
+    nInternalEdges_(-1)
 {}
 
 
@@ -102,25 +66,7 @@ Foam::PrimitivePatch<FaceList, PointField>::PrimitivePatch
 :
     FaceList(faces, reuse),
     points_(points, reuse),
-    edgesPtr_(nullptr),
-    nInternalEdges_(-1),
-    boundaryPointsPtr_(nullptr),
-    faceFacesPtr_(nullptr),
-    edgeFacesPtr_(nullptr),
-    faceEdgesPtr_(nullptr),
-    pointEdgesPtr_(nullptr),
-    pointFacesPtr_(nullptr),
-    localFacesPtr_(nullptr),
-    meshPointsPtr_(nullptr),
-    meshPointMapPtr_(nullptr),
-    edgeLoopsPtr_(nullptr),
-    localPointsPtr_(nullptr),
-    localPointOrderPtr_(nullptr),
-    faceCentresPtr_(nullptr),
-    faceAreasPtr_(nullptr),
-    magFaceAreasPtr_(nullptr),
-    faceNormalsPtr_(nullptr),
-    pointNormalsPtr_(nullptr)
+    nInternalEdges_(-1)
 {}
 
 
@@ -132,25 +78,7 @@ Foam::PrimitivePatch<FaceList, PointField>::PrimitivePatch
 :
     FaceList(pp),
     points_(pp.points_),
-    edgesPtr_(nullptr),
-    nInternalEdges_(-1),
-    boundaryPointsPtr_(nullptr),
-    faceFacesPtr_(nullptr),
-    edgeFacesPtr_(nullptr),
-    faceEdgesPtr_(nullptr),
-    pointEdgesPtr_(nullptr),
-    pointFacesPtr_(nullptr),
-    localFacesPtr_(nullptr),
-    meshPointsPtr_(nullptr),
-    meshPointMapPtr_(nullptr),
-    edgeLoopsPtr_(nullptr),
-    localPointsPtr_(nullptr),
-    localPointOrderPtr_(nullptr),
-    faceCentresPtr_(nullptr),
-    faceAreasPtr_(nullptr),
-    magFaceAreasPtr_(nullptr),
-    faceNormalsPtr_(nullptr),
-    pointNormalsPtr_(nullptr)
+    nInternalEdges_(-1)
 {}
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
index a680acbc8a..f8e9cd87d8 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(primitiveMesh, 0);
+    defineTypeNameAndDebug(primitiveMesh, 0);
 }
 
 
@@ -48,30 +48,7 @@ Foam::primitiveMesh::primitiveMesh()
     nEdges_(-1),
     nInternalFaces_(0),
     nFaces_(0),
-    nCells_(0),
-
-    cellShapesPtr_(nullptr),
-    edgesPtr_(nullptr),
-    ccPtr_(nullptr),
-    ecPtr_(nullptr),
-    pcPtr_(nullptr),
-
-    cfPtr_(nullptr),
-    efPtr_(nullptr),
-    pfPtr_(nullptr),
-
-    cePtr_(nullptr),
-    fePtr_(nullptr),
-    pePtr_(nullptr),
-    ppPtr_(nullptr),
-    cpPtr_(nullptr),
-
-    labels_(0),
-
-    cellCentresPtr_(nullptr),
-    faceCentresPtr_(nullptr),
-    cellVolumesPtr_(nullptr),
-    faceAreasPtr_(nullptr)
+    nCells_(0)
 {}
 
 
@@ -88,30 +65,7 @@ Foam::primitiveMesh::primitiveMesh
     nEdges_(-1),
     nInternalFaces_(nInternalFaces),
     nFaces_(nFaces),
-    nCells_(nCells),
-
-    cellShapesPtr_(nullptr),
-    edgesPtr_(nullptr),
-    ccPtr_(nullptr),
-    ecPtr_(nullptr),
-    pcPtr_(nullptr),
-
-    cfPtr_(nullptr),
-    efPtr_(nullptr),
-    pfPtr_(nullptr),
-
-    cePtr_(nullptr),
-    fePtr_(nullptr),
-    pePtr_(nullptr),
-    ppPtr_(nullptr),
-    cpPtr_(nullptr),
-
-    labels_(0),
-
-    cellCentresPtr_(nullptr),
-    faceCentresPtr_(nullptr),
-    cellVolumesPtr_(nullptr),
-    faceAreasPtr_(nullptr)
+    nCells_(nCells)
 {}
 
 
@@ -273,7 +227,7 @@ void Foam::primitiveMesh::reset
         nCells
     );
 
-    cfPtr_ = new cellList(clst, true);
+    cfPtr_ = std::make_unique<cellList>(std::move(clst));
 }
 
 
@@ -301,10 +255,10 @@ void Foam::primitiveMesh::resetGeometry
     // Remove old geometry
     clearGeom();
 
-    faceCentresPtr_ = new pointField(std::move(faceCentres));
-    faceAreasPtr_ = new pointField(std::move(faceAreas));
-    cellCentresPtr_ = new pointField(std::move(cellCentres));
-    cellVolumesPtr_ = new scalarField(std::move(cellVolumes));
+    faceCentresPtr_ = std::make_unique<pointField>(std::move(faceCentres));
+    faceAreasPtr_ = std::make_unique<pointField>(std::move(faceAreas));
+    cellCentresPtr_ = std::make_unique<pointField>(std::move(cellCentres));
+    cellVolumesPtr_ = std::make_unique<scalarField>(std::move(cellVolumes));
 
     if (debug)
     {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index edec71812b..8964814412 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -114,46 +114,46 @@ class primitiveMesh
         // Shapes
 
             //- Cell shapes
-            mutable cellShapeList* cellShapesPtr_;
+            mutable std::unique_ptr<cellShapeList> cellShapesPtr_;
 
             //- Edges
-            mutable edgeList* edgesPtr_;
+            mutable std::unique_ptr<edgeList> edgesPtr_;
 
 
         // Connectivity
 
             //- Cell-cells
-            mutable labelListList* ccPtr_;
+            mutable std::unique_ptr<labelListList> ccPtr_;
 
             //- Edge-cells
-            mutable labelListList* ecPtr_;
+            mutable std::unique_ptr<labelListList> ecPtr_;
 
             //- Point-cells
-            mutable labelListList* pcPtr_;
+            mutable std::unique_ptr<labelListList> pcPtr_;
 
             //- Cell-faces
-            mutable cellList* cfPtr_;
+            mutable std::unique_ptr<cellList> cfPtr_;
 
             //- Edge-faces
-            mutable labelListList* efPtr_;
+            mutable std::unique_ptr<labelListList> efPtr_;
 
             //- Point-faces
-            mutable labelListList* pfPtr_;
+            mutable std::unique_ptr<labelListList> pfPtr_;
 
             //- Cell-edges
-            mutable labelListList* cePtr_;
+            mutable std::unique_ptr<labelListList> cePtr_;
 
             //- Face-edges
-            mutable labelListList* fePtr_;
+            mutable std::unique_ptr<labelListList> fePtr_;
 
             //- Point-edges
-            mutable labelListList* pePtr_;
+            mutable std::unique_ptr<labelListList> pePtr_;
 
             //- Point-points
-            mutable labelListList* ppPtr_;
+            mutable std::unique_ptr<labelListList> ppPtr_;
 
             //- Cell-points
-            mutable labelListList* cpPtr_;
+            mutable std::unique_ptr<labelListList> cpPtr_;
 
 
         // On-the-fly edge addressing storage
@@ -168,16 +168,16 @@ class primitiveMesh
         // Geometric data
 
             //- Cell centres
-            mutable vectorField* cellCentresPtr_;
+            mutable std::unique_ptr<vectorField> cellCentresPtr_;
 
             //- Face centres
-            mutable vectorField* faceCentresPtr_;
+            mutable std::unique_ptr<vectorField> faceCentresPtr_;
 
             //- Cell volumes
-            mutable scalarField* cellVolumesPtr_;
+            mutable std::unique_ptr<scalarField> cellVolumesPtr_;
 
             //- Face areas
-            mutable vectorField* faceAreasPtr_;
+            mutable std::unique_ptr<vectorField> faceAreasPtr_;
 
 
     // Private Member Functions
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
index f3d90e1184..4790b99f3a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,8 +49,8 @@ void Foam::primitiveMesh::calcCellShapes() const
     }
     else
     {
-        cellShapesPtr_ = new cellShapeList(nCells());
-        cellShapeList& cellShapes = *cellShapesPtr_;
+        cellShapesPtr_ = std::make_unique<cellShapeList>(nCells());
+        auto& cellShapes = *cellShapesPtr_;
 
         forAll(cellShapes, celli)
         {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
index e28eb7e53f..3738a46c1c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
+    Copyright (C) 2023-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,7 +72,7 @@ void Foam::primitiveMesh::calcCellCells() const
         }
 
         // Create the storage
-        ccPtr_ = new labelListList(ncc.size());
+        ccPtr_ = std::make_unique<labelListList>(ncc.size());
         auto& cellCellAddr = *ccPtr_;
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
index 56c83e4306..88b53852ce 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,12 +53,12 @@ void Foam::primitiveMesh::calcCellCentresAndVols() const
     }
 
     // set the accumulated cell centre to zero vector
-    cellCentresPtr_ = new vectorField(nCells(), Zero);
-    vectorField& cellCtrs = *cellCentresPtr_;
+    cellCentresPtr_ = std::make_unique<vectorField>(nCells(), Zero);
+    auto& cellCtrs = *cellCentresPtr_;
 
     // Initialise cell volumes to 0
-    cellVolumesPtr_ = new scalarField(nCells(), Zero);
-    scalarField& cellVols = *cellVolumesPtr_;
+    cellVolumesPtr_ = std::make_unique<scalarField>(nCells(), Zero);
+    auto& cellVols = *cellVolumesPtr_;
 
     // Make centres and volumes
     primitiveMeshTools::makeCellCentresAndVols
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
index 53489382e5..d33b897c75 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -104,8 +104,8 @@ void Foam::primitiveMesh::calcCellEdges() const
             }
         }
 
-        cePtr_ = new labelListList(ce.size());
-        labelListList& cellEdgeAddr = *cePtr_;
+        cePtr_ = std::make_unique<labelListList>(ce.size());
+        auto& cellEdgeAddr = *cePtr_;
 
         // reset the size
         forAll(ce, celli)
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
index 7adcae2cc6..28f12ff977 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,14 +61,14 @@ void Foam::primitiveMesh::calcCellPoints() const
     else if (hasPointCells())
     {
         // Invert pointCells
-        cpPtr_ = new labelListList(nCells());
+        cpPtr_ = std::make_unique<labelListList>(nCells());
         invertManyToMany(nCells(), pointCells(), *cpPtr_);
     }
     else
     {
         // Calculate cell-point topology
 
-        cpPtr_ = new labelListList(nCells());
+        cpPtr_ = std::make_unique<labelListList>(nCells());
         auto& cellPointAddr = *cpPtr_;
 
         const cellList& cellLst = cells();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
index 413bce401e..664f18e68b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -119,8 +120,8 @@ void Foam::primitiveMesh::calcCells() const
     else
     {
         // Create the storage
-        cfPtr_ = new cellList(nCells());
-        cellList& cellFaceAddr = *cfPtr_;
+        cfPtr_ = std::make_unique<cellList>(nCells());
+        auto& cellFaceAddr = *cfPtr_;
 
         calcCells
         (
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
index 13494c0cae..71ab46fe10 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "primitiveMesh.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -132,10 +132,10 @@ void Foam::primitiveMesh::clearGeom()
             << endl;
     }
 
-    deleteDemandDrivenData(cellCentresPtr_);
-    deleteDemandDrivenData(cellVolumesPtr_);
-    deleteDemandDrivenData(faceCentresPtr_);
-    deleteDemandDrivenData(faceAreasPtr_);
+    cellCentresPtr_.reset(nullptr);
+    cellVolumesPtr_.reset(nullptr);
+    faceCentresPtr_.reset(nullptr);
+    faceAreasPtr_.reset(nullptr);
 }
 
 
@@ -148,8 +148,8 @@ void Foam::primitiveMesh::clearCellGeom()
             << endl;
     }
 
-    deleteDemandDrivenData(cellCentresPtr_);
-    deleteDemandDrivenData(cellVolumesPtr_);
+    cellCentresPtr_.reset(nullptr);
+    cellVolumesPtr_.reset(nullptr);
 }
 
 
@@ -162,23 +162,23 @@ void Foam::primitiveMesh::clearAddressing()
             << endl;
     }
 
-    deleteDemandDrivenData(cellShapesPtr_);
+    cellShapesPtr_.reset(nullptr);
 
     clearOutEdges();
 
-    deleteDemandDrivenData(ccPtr_);
-    deleteDemandDrivenData(ecPtr_);
-    deleteDemandDrivenData(pcPtr_);
+    ccPtr_.reset(nullptr);
+    ecPtr_.reset(nullptr);
+    pcPtr_.reset(nullptr);
 
-    deleteDemandDrivenData(cfPtr_);
-    deleteDemandDrivenData(efPtr_);
-    deleteDemandDrivenData(pfPtr_);
+    cfPtr_.reset(nullptr);
+    efPtr_.reset(nullptr);
+    pfPtr_.reset(nullptr);
 
-    deleteDemandDrivenData(cePtr_);
-    deleteDemandDrivenData(fePtr_);
-    deleteDemandDrivenData(pePtr_);
-    deleteDemandDrivenData(ppPtr_);
-    deleteDemandDrivenData(cpPtr_);
+    cePtr_.reset(nullptr);
+    fePtr_.reset(nullptr);
+    pePtr_.reset(nullptr);
+    ppPtr_.reset(nullptr);
+    cpPtr_.reset(nullptr);
 }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
index b4719c206b..a0bb92b077 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
+    Copyright (C) 2023-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,7 +48,7 @@ const Foam::labelListList& Foam::primitiveMesh::edgeCells() const
             }
         }
         // Invert cellEdges
-        ecPtr_ = new labelListList(nEdges());
+        ecPtr_ = std::make_unique<labelListList>(nEdges());
         invertManyToMany(nEdges(), cellEdges(), *ecPtr_);
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
index 61e79c2778..0c9e3e65b5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,7 +49,7 @@ const Foam::labelListList& Foam::primitiveMesh::edgeFaces() const
         }
 
         // Invert faceEdges
-        efPtr_ = new labelListList(nEdges());
+        efPtr_ = std::make_unique<labelListList>(nEdges());
         invertManyToMany(nEdges(), faceEdges(), *efPtr_);
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
index 1d5ad4aac6..c47e6748f7 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,6 @@ License
 
 #include "primitiveMesh.H"
 #include "DynamicList.H"
-#include "demandDrivenData.H"
 #include "SortableList.H"
 #include "ListOps.H"
 
@@ -129,8 +128,8 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
         // Estimate faceEdges storage
         if (doFaceEdges)
         {
-            fePtr_ = new labelListList(fcs.size());
-            labelListList& faceEdges = *fePtr_;
+            fePtr_ = std::make_unique<labelListList>(fcs.size());
+            auto& faceEdges = *fePtr_;
             forAll(fcs, facei)
             {
                 faceEdges[facei].setSize(fcs[facei].size());
@@ -435,16 +434,16 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
         // Renumber and transfer.
 
         // Edges
-        edgesPtr_ = new edgeList(es.size());
-        edgeList& edges = *edgesPtr_;
+        edgesPtr_ = std::make_unique<edgeList>(es.size());
+        auto& edges = *edgesPtr_;
         forAll(es, edgeI)
         {
             edges[oldToNew[edgeI]] = es[edgeI];
         }
 
         // pointEdges
-        pePtr_ = new labelListList(nPoints());
-        labelListList& pointEdges = *pePtr_;
+        pePtr_ = std::make_unique<labelListList>(nPoints());
+        auto& pointEdges = *pePtr_;
         forAll(pe, pointi)
         {
             DynamicList<label>& pEdges = pe[pointi];
@@ -457,7 +456,7 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
         // faceEdges
         if (doFaceEdges)
         {
-            labelListList& faceEdges = *fePtr_;
+            auto& faceEdges = *fePtr_;
             forAll(faceEdges, facei)
             {
                 inplaceRenumber(oldToNew, faceEdges[facei]);
@@ -552,8 +551,8 @@ const Foam::labelListList& Foam::primitiveMesh::faceEdges() const
         const labelListList& pe = pointEdges();
         const edgeList& es = edges();
 
-        fePtr_ = new labelListList(fcs.size());
-        labelListList& faceEdges = *fePtr_;
+        fePtr_ = std::make_unique<labelListList>(fcs.size());
+        auto& faceEdges = *fePtr_;
 
         forAll(fcs, facei)
         {
@@ -590,9 +589,9 @@ const Foam::labelListList& Foam::primitiveMesh::faceEdges() const
 
 void Foam::primitiveMesh::clearOutEdges()
 {
-    deleteDemandDrivenData(edgesPtr_);
-    deleteDemandDrivenData(pePtr_);
-    deleteDemandDrivenData(fePtr_);
+    edgesPtr_.reset(nullptr);
+    pePtr_.reset(nullptr);
+    fePtr_.reset(nullptr);
     labels_.clear();
     labelSet_.clear();
 }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
index 138baedde7..7561c62a34 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,11 +55,11 @@ void Foam::primitiveMesh::calcFaceCentresAndAreas() const
             << abort(FatalError);
     }
 
-    faceCentresPtr_ = new vectorField(nFaces());
-    vectorField& fCtrs = *faceCentresPtr_;
+    faceCentresPtr_ = std::make_unique<vectorField>(nFaces());
+    auto& fCtrs = *faceCentresPtr_;
 
-    faceAreasPtr_ = new vectorField(nFaces());
-    vectorField& fAreas = *faceAreasPtr_;
+    faceAreasPtr_ = std::make_unique<vectorField>(nFaces());
+    auto& fAreas = *faceAreasPtr_;
 
     primitiveMeshTools::makeFaceCentresAndAreas(*this, points(), fCtrs, fAreas);
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
index a93d23360c..63d40fb54c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
+    Copyright (C) 2023-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,7 +62,7 @@ void Foam::primitiveMesh::calcPointCells() const
     else if (hasCellPoints())
     {
         // Invert cellPoints
-        pcPtr_ = new labelListList(nPoints());
+        pcPtr_ = std::make_unique<labelListList>(nPoints());
         invertManyToMany(nPoints(), cellPoints(), *pcPtr_);
     }
     else if (hasPointFaces())
@@ -81,7 +81,7 @@ void Foam::primitiveMesh::calcPointCells() const
 
         const label loopLen = nPoints();
 
-        pcPtr_ = new labelListList(nPoints());
+        pcPtr_ = std::make_unique<labelListList>(nPoints());
         auto& pointCellAddr = *pcPtr_;
 
         for (label pointi = 0; pointi < loopLen; ++pointi)
@@ -153,7 +153,7 @@ void Foam::primitiveMesh::calcPointCells() const
 
         // Step 2: set sizing, reset counters
 
-        pcPtr_ = new labelListList(nPoints());
+        pcPtr_ = std::make_unique<labelListList>(nPoints());
         auto& pointCellAddr = *pcPtr_;
 
         forAll(pointCellAddr, pointi)
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C
index 00b4723ab7..54747be56e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,8 +40,9 @@ const Foam::labelListList& Foam::primitiveMesh::pointFaces() const
             Pout<< "primitiveMesh::pointFaces() : "
                 << "calculating pointFaces" << endl;
         }
+
         // Invert faces()
-        pfPtr_ = new labelListList(nPoints());
+        pfPtr_ = std::make_unique<labelListList>(nPoints());
         invertManyToMany(nPoints(), faces(), *pfPtr_);
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
index 8cc5aa9222..fc5e246195 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
+    Copyright (C) 2023-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,8 +60,8 @@ void Foam::primitiveMesh::calcPointPoints() const
         const edgeList& e = edges();
         const labelListList& pe = pointEdges();
 
-        ppPtr_ = new labelListList(pe.size());
-        labelListList& pp = *ppPtr_;
+        ppPtr_ = std::make_unique<labelListList>(pe.size());
+        auto& pp = *ppPtr_;
 
         forAll(pe, pointi)
         {
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
index 015aa57571..aa5bf5a4fd 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2019 Zeljko Tukovic, FSB Zagreb.
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,6 @@ License
 #include "twoDPointCorrector.H"
 #include "gravityMeshObject.H"
 #include "turbulentTransportModel.H"
-#include "demandDrivenData.H"
 #include "unitConversion.H"
 #include "foamVtkIndPatchWriter.H"
 #include "calculatedFaPatchFields.H"
@@ -210,7 +209,7 @@ void Foam::interfaceTrackingFvMesh::makeUs() const
         }
     }
 
-    UsPtr_ = new areaVectorField
+    UsPtr_ = std::make_unique<areaVectorField>
     (
         IOobject
         (
@@ -268,7 +267,7 @@ void Foam::interfaceTrackingFvMesh::makeFsNetPhi() const
             << abort(FatalError);
     }
 
-    fsNetPhiPtr_ = new areaScalarField
+    fsNetPhiPtr_ = std::make_unique<areaScalarField>
     (
         IOobject
         (
@@ -309,14 +308,14 @@ void Foam::interfaceTrackingFvMesh::makeControlPoints()
     if (pointsIO.typeHeaderOk<vectorIOField>())
     {
         Info<< "Reading control points" << endl;
-        controlPointsPtr_ = new vectorIOField(pointsIO);
+        controlPointsPtr_ = std::make_unique<vectorIOField>(pointsIO);
     }
     else
     {
         pointsIO.readOpt(IOobject::NO_READ);
 
         Info<< "Creating new control points" << endl;
-        controlPointsPtr_ = new vectorIOField
+        controlPointsPtr_ = std::make_unique<vectorIOField>
         (
             pointsIO,
             aMesh().areaCentres().internalField()
@@ -339,7 +338,7 @@ void Foam::interfaceTrackingFvMesh::makeMotionPointsMask()
             << abort(FatalError);
     }
 
-    motionPointsMaskPtr_ = new labelList
+    motionPointsMaskPtr_ = std::make_unique<labelList>
     (
         mesh().boundaryMesh()[fsPatchIndex()].nPoints(),
         1
@@ -402,14 +401,14 @@ void Foam::interfaceTrackingFvMesh::makeDirections()
     }
 
     pointsDisplacementDirPtr_ =
-        new vectorField
+        std::make_unique<vectorField>
         (
             mesh().boundaryMesh()[fsPatchIndex()].nPoints(),
             Zero
         );
 
     facesDisplacementDirPtr_ =
-        new vectorField
+        std::make_unique<vectorField>
         (
             mesh().boundaryMesh()[fsPatchIndex()].size(),
             Zero
@@ -444,7 +443,7 @@ void Foam::interfaceTrackingFvMesh::makePhis()
             << abort(FatalError);
     }
 
-    phisPtr_ = new edgeScalarField
+    phisPtr_ = std::make_unique<edgeScalarField>
     (
         IOobject
         (
@@ -471,7 +470,7 @@ void Foam::interfaceTrackingFvMesh::makeSurfactConc() const
             << abort(FatalError);
     }
 
-    surfactConcPtr_ = new areaScalarField
+    surfactConcPtr_ = std::make_unique<areaScalarField>
     (
         IOobject
         (
@@ -502,7 +501,7 @@ void Foam::interfaceTrackingFvMesh::makeBulkSurfactConc() const
             << abort(FatalError);
     }
 
-    bulkSurfactConcPtr_ = new volScalarField
+    bulkSurfactConcPtr_ = std::make_unique<volScalarField>
     (
         IOobject
         (
@@ -518,7 +517,7 @@ void Foam::interfaceTrackingFvMesh::makeBulkSurfactConc() const
         ),
         mesh()
     );
-    volScalarField& bulkSurfactConc = *bulkSurfactConcPtr_;
+    auto& bulkSurfactConc = *bulkSurfactConcPtr_;
 
     if (mesh().time().timeIndex()-1 == 0)
     {
@@ -541,7 +540,7 @@ void Foam::interfaceTrackingFvMesh::makeSurfaceTension() const
             << abort(FatalError);
     }
 
-    surfaceTensionPtr_ = new areaScalarField
+    surfaceTensionPtr_ = std::make_unique<areaScalarField>
     (
         IOobject
         (
@@ -571,7 +570,7 @@ void Foam::interfaceTrackingFvMesh::makeSurfactant() const
     const dictionary& surfactProp =
         motion().subDict("surfactantProperties");
 
-    surfactantPtr_ = new surfactantProperties(surfactProp);
+    surfactantPtr_ = std::make_unique<surfactantProperties>(surfactProp);
 }
 
 
@@ -601,7 +600,8 @@ void Foam::interfaceTrackingFvMesh::makeContactAngle()
     {
         Info<< "Reading contact angle field" << endl;
 
-        contactAnglePtr_ = new areaScalarField(contactAngleHeader, aMesh());
+        contactAnglePtr_ =
+            std::make_unique<areaScalarField>(contactAngleHeader, aMesh());
     }
 }
 
@@ -1275,14 +1275,7 @@ void Foam::interfaceTrackingFvMesh::correctContactLinePointNormals()
 // #       include "createTangentField.H"
         areaVectorField tangent
         (
-            IOobject
-            (
-                "tangent",
-                aMesh().time().timeName(),
-                aMesh().thisDb(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
+            aMesh().thisDb().newIOobject("tangent"),
             aMesh(),
             dimensioned<vector>(dimless, Zero)
         );
@@ -1534,7 +1527,6 @@ Foam::interfaceTrackingFvMesh::interfaceTrackingFvMesh
 )
 :
     dynamicMotionSolverFvMesh(io, doInit),
-    aMeshPtr_(nullptr),
     fsPatchIndex_(-1),
     fixedFreeSurfacePatches_(),
     nonReflectingFreeSurfacePatches_(),
@@ -1547,19 +1539,7 @@ Foam::interfaceTrackingFvMesh::interfaceTrackingFvMesh
     correctContactLineNormals_(false),
     sigma0_("zero", dimForce/dimLength/dimDensity, Zero),
     rho_("one", dimDensity, 1.0),
-    timeIndex_(-1),
-    UsPtr_(nullptr),
-    controlPointsPtr_(nullptr),
-    motionPointsMaskPtr_(nullptr),
-    pointsDisplacementDirPtr_(nullptr),
-    facesDisplacementDirPtr_(nullptr),
-    fsNetPhiPtr_(nullptr),
-    phisPtr_(nullptr),
-    surfactConcPtr_(nullptr),
-    bulkSurfactConcPtr_(nullptr),
-    surfaceTensionPtr_(nullptr),
-    surfactantPtr_(nullptr),
-    contactAnglePtr_(nullptr)
+    timeIndex_(-1)
 {
     if (doInit)
     {
@@ -1598,39 +1578,14 @@ Foam::interfaceTrackingFvMesh::interfaceTrackingFvMesh
     pureFreeSurface_(true),
     sigma0_("zero", dimForce/dimLength/dimDensity, Zero),
     rho_("one", dimDensity, 1.0),
-    timeIndex_(-1),
-    UsPtr_(nullptr),
-    controlPointsPtr_(nullptr),
-    motionPointsMaskPtr_(nullptr),
-    pointsDisplacementDirPtr_(nullptr),
-    facesDisplacementDirPtr_(nullptr),
-    fsNetPhiPtr_(nullptr),
-    phisPtr_(nullptr),
-    surfactConcPtr_(nullptr),
-    bulkSurfactConcPtr_(nullptr),
-    surfaceTensionPtr_(nullptr),
-    surfactantPtr_(nullptr),
-    contactAnglePtr_(nullptr)
+    timeIndex_(-1)
 {}
 */
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::interfaceTrackingFvMesh::~interfaceTrackingFvMesh()
-{
-    deleteDemandDrivenData(UsPtr_);
-    deleteDemandDrivenData(controlPointsPtr_);
-    deleteDemandDrivenData(motionPointsMaskPtr_);
-    deleteDemandDrivenData(pointsDisplacementDirPtr_);
-    deleteDemandDrivenData(facesDisplacementDirPtr_);
-    deleteDemandDrivenData(fsNetPhiPtr_);
-    deleteDemandDrivenData(phisPtr_);
-    deleteDemandDrivenData(surfactConcPtr_);
-    deleteDemandDrivenData(bulkSurfactConcPtr_);
-    deleteDemandDrivenData(surfaceTensionPtr_);
-    deleteDemandDrivenData(surfactantPtr_);
-    deleteDemandDrivenData(contactAnglePtr_);
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.H b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.H
index 478daa657e..f6001f1e59 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.H
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2019 Zeljko Tukovic, FSB Zagreb.
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,7 +45,6 @@ SourceFiles
 #include "surfaceFields.H"
 #include "surfactantProperties.H"
 #include "singlePhaseTransportModel.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -107,42 +106,43 @@ class interfaceTrackingFvMesh
         label timeIndex_;
 
         //- Free-surface velocity field
-        mutable areaVectorField* UsPtr_;
+        mutable std::unique_ptr<areaVectorField> UsPtr_;
 
         //- Points which are attached to the free-surface A side faces
         //  and which defines the free-surface shape
-        mutable vectorIOField* controlPointsPtr_;
+        mutable std::unique_ptr<vectorIOField> controlPointsPtr_;
 
         //- Field which additionally determines
         //  the motion of free-surface points
-        mutable labelList* motionPointsMaskPtr_;
+        mutable std::unique_ptr<labelList> motionPointsMaskPtr_;
 
         //- Displacement direction of free-surface points
-        mutable vectorField* pointsDisplacementDirPtr_;
+        mutable std::unique_ptr<vectorField> pointsDisplacementDirPtr_;
 
         //- Displacement direction of free-surface control points
-        mutable vectorField* facesDisplacementDirPtr_;
+        mutable std::unique_ptr<vectorField> facesDisplacementDirPtr_;
 
         //- Free-surface net flux
-        mutable areaScalarField* fsNetPhiPtr_;
+        mutable std::unique_ptr<areaScalarField> fsNetPhiPtr_;
 
         //- Free-surface flux
-        mutable edgeScalarField* phisPtr_;
+        mutable std::unique_ptr<edgeScalarField> phisPtr_;
 
         //- Free-surface surfactant concetration
-        mutable areaScalarField* surfactConcPtr_;
+        mutable std::unique_ptr<areaScalarField> surfactConcPtr_;
 
         //- Volume surfactant concetration
-        mutable volScalarField* bulkSurfactConcPtr_;
+        mutable std::unique_ptr<volScalarField> bulkSurfactConcPtr_;
 
         //- Surface tension field
-        mutable areaScalarField* surfaceTensionPtr_;
+        mutable std::unique_ptr<areaScalarField> surfaceTensionPtr_;
 
         //- Surfactant properties
-        mutable surfactantProperties* surfactantPtr_;
+        mutable std::unique_ptr<surfactantProperties> surfactantPtr_;
 
         //- Contact angle
-        mutable areaScalarField* contactAnglePtr_;
+        mutable std::unique_ptr<areaScalarField> contactAnglePtr_;
+
 
     // Private Member Functions
 
@@ -425,7 +425,7 @@ public:
         //- Clear control points
         void clearControlPoints()
         {
-            deleteDemandDrivenData(controlPointsPtr_);
+            controlPointsPtr_.reset(nullptr);
         }
 
         //- Write VTK freeSurface mesh
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index 1770da3b1e..5e7a6e94de 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -32,7 +32,6 @@ License
 #include "Time.H"
 #include "polyMesh.H"
 #include "primitiveMesh.H"
-#include "demandDrivenData.H"
 #include "IndirectList.H"
 #include "areaFields.H"
 #include "edgeFields.H"
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index b00996c073..b2b64f0d13 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -33,7 +33,6 @@ License
 #include "coupledFvPatchFields.H"
 #include "IndirectList.H"
 #include "UniformList.H"
-#include "demandDrivenData.H"
 
 #include "cyclicFvPatchField.H"
 #include "cyclicAMIFvPatchField.H"
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index b55557f6be..9a663b1a27 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -32,7 +32,6 @@ License
 #include "slicedVolFields.H"
 #include "slicedSurfaceFields.H"
 #include "SubField.H"
-#include "demandDrivenData.H"
 #include "fvMeshLduAddressing.H"
 #include "mapPolyMesh.H"
 #include "MapFvFields.H"
@@ -67,11 +66,11 @@ void Foam::fvMesh::clearGeomNotOldVol()
         MoveableMeshObject
     >(*this);
 
-    deleteDemandDrivenData(VPtr_);
-    deleteDemandDrivenData(SfPtr_);
-    deleteDemandDrivenData(magSfPtr_);
-    deleteDemandDrivenData(CPtr_);
-    deleteDemandDrivenData(CfPtr_);
+    VPtr_.reset(nullptr);
+    SfPtr_.reset(nullptr);
+    magSfPtr_.reset(nullptr);
+    CPtr_.reset(nullptr);
+    CfPtr_.reset(nullptr);
 }
 
 
@@ -117,8 +116,8 @@ void Foam::fvMesh::clearGeom()
 {
     clearGeomNotOldVol();
 
-    deleteDemandDrivenData(V0Ptr_);
-    deleteDemandDrivenData(V00Ptr_);
+    V0Ptr_.reset(nullptr);
+    V00Ptr_.reset(nullptr);
 
     // Mesh motion flux cannot be deleted here because the old-time flux
     // needs to be saved.
@@ -157,7 +156,8 @@ void Foam::fvMesh::clearAddressing(const bool isMeshUpdate)
         meshObject::clear<fvMesh, TopologicalMeshObject>(*this);
         meshObject::clear<lduMesh, TopologicalMeshObject>(*this);
     }
-    deleteDemandDrivenData(lduPtr_);
+
+    lduPtr_.reset(nullptr);
 }
 
 
@@ -178,7 +178,7 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
 
         if (!V0Ptr_)
         {
-            V0Ptr_ = new DimensionedField<scalar, volMesh>
+            V0Ptr_ = std::make_unique<DimensionedField<scalar, volMesh>>
             (
                 IOobject
                 (
@@ -255,16 +255,7 @@ Foam::fvMesh::fvMesh(const IOobject& io, const bool doInit)
     surfaceInterpolation(*this),
     fvSolution(static_cast<const objectRegistry&>(*this)),
     boundary_(*this, boundaryMesh()),
-    lduPtr_(nullptr),
-    curTimeIndex_(time().timeIndex()),
-    VPtr_(nullptr),
-    V0Ptr_(nullptr),
-    V00Ptr_(nullptr),
-    SfPtr_(nullptr),
-    magSfPtr_(nullptr),
-    CPtr_(nullptr),
-    CfPtr_(nullptr),
-    phiPtr_(nullptr)
+    curTimeIndex_(time().timeIndex())
 {
     DebugInFunction << "Constructing fvMesh from IOobject" << endl;
 
@@ -310,7 +301,7 @@ bool Foam::fvMesh::init(const bool doInit)
         DebugInFunction
             << "Detected V0: " << rio.objectRelPath() << nl;
 
-        V0Ptr_ = new DimensionedField<scalar, volMesh>
+        V0Ptr_ = std::make_unique<DimensionedField<scalar, volMesh>>
         (
             rio,
             *this,
@@ -351,7 +342,7 @@ bool Foam::fvMesh::init(const bool doInit)
         // read initialise to the current cell volumes
         if (!V0Ptr_)
         {
-            V0Ptr_ = new DimensionedField<scalar, volMesh>
+            V0Ptr_ = std::make_unique<DimensionedField<scalar, volMesh>>
             (
                 IOobject
                 (
@@ -395,16 +386,7 @@ Foam::fvMesh::fvMesh
     surfaceInterpolation(*this),
     fvSolution(static_cast<const objectRegistry&>(*this)),
     boundary_(*this),
-    lduPtr_(nullptr),
-    curTimeIndex_(time().timeIndex()),
-    VPtr_(nullptr),
-    V0Ptr_(nullptr),
-    V00Ptr_(nullptr),
-    SfPtr_(nullptr),
-    magSfPtr_(nullptr),
-    CPtr_(nullptr),
-    CfPtr_(nullptr),
-    phiPtr_(nullptr)
+    curTimeIndex_(time().timeIndex())
 {
     DebugInFunction << "Constructing fvMesh from components" << endl;
 }
@@ -431,16 +413,7 @@ Foam::fvMesh::fvMesh
     surfaceInterpolation(*this),
     fvSolution(static_cast<const objectRegistry&>(*this)),
     boundary_(*this),
-    lduPtr_(nullptr),
-    curTimeIndex_(time().timeIndex()),
-    VPtr_(nullptr),
-    V0Ptr_(nullptr),
-    V00Ptr_(nullptr),
-    SfPtr_(nullptr),
-    magSfPtr_(nullptr),
-    CPtr_(nullptr),
-    CfPtr_(nullptr),
-    phiPtr_(nullptr)
+    curTimeIndex_(time().timeIndex())
 {
     DebugInFunction << "Constructing fvMesh from components" << endl;
 }
@@ -507,16 +480,7 @@ Foam::fvMesh::fvMesh
         static_cast<const dictionary*>(baseMesh.hasSolution())
     ),
     boundary_(*this),
-    lduPtr_(nullptr),
-    curTimeIndex_(time().timeIndex()),
-    VPtr_(nullptr),
-    V0Ptr_(nullptr),
-    V00Ptr_(nullptr),
-    SfPtr_(nullptr),
-    magSfPtr_(nullptr),
-    CPtr_(nullptr),
-    CfPtr_(nullptr),
-    phiPtr_(nullptr)
+    curTimeIndex_(time().timeIndex())
 {
     DebugInFunction << "Constructing fvMesh as copy and primitives" << endl;
 
@@ -557,16 +521,7 @@ Foam::fvMesh::fvMesh
         static_cast<const dictionary*>(baseMesh.hasSolution())
     ),
     boundary_(*this),
-    lduPtr_(nullptr),
-    curTimeIndex_(time().timeIndex()),
-    VPtr_(nullptr),
-    V0Ptr_(nullptr),
-    V00Ptr_(nullptr),
-    SfPtr_(nullptr),
-    magSfPtr_(nullptr),
-    CPtr_(nullptr),
-    CfPtr_(nullptr),
-    phiPtr_(nullptr)
+    curTimeIndex_(time().timeIndex())
 {
     DebugInFunction << "Constructing fvMesh as copy and primitives" << endl;
 
@@ -764,7 +719,7 @@ const Foam::lduAddressing& Foam::fvMesh::lduAddr() const
             << "Calculating fvMeshLduAddressing from nFaces:"
             << nFaces() << endl;
 
-        lduPtr_ = new fvMeshLduAddressing(*this);
+        lduPtr_ = std::make_unique<fvMeshLduAddressing>(*this);
 
         return *lduPtr_;
     }
@@ -1017,7 +972,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
     polyMesh::updateMesh(mpm);
 
     // Our slice of the addressing is no longer valid
-    deleteDemandDrivenData(lduPtr_);
+    lduPtr_.reset(nullptr);
 
     if (VPtr_)
     {
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index a53d90899b..0b53c1baa1 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -98,7 +98,7 @@ protected:
 
     // Demand-Driven Data
 
-        mutable fvMeshLduAddressing* lduPtr_;
+        mutable std::unique_ptr<fvMeshLduAddressing> lduPtr_;
 
         //- Current time index for cell volumes
         //  Note.  The whole mechanism will be replaced once the
@@ -107,25 +107,25 @@ protected:
         mutable label curTimeIndex_;
 
         //- Cell volumes
-        mutable SlicedDimensionedField<scalar, volMesh>* VPtr_;
+        mutable std::unique_ptr<SlicedDimensionedField<scalar, volMesh>> VPtr_;
 
         //- Cell volumes old time level
-        mutable DimensionedField<scalar, volMesh>* V0Ptr_;
+        mutable std::unique_ptr<DimensionedField<scalar, volMesh>> V0Ptr_;
 
         //- Cell volumes old-old time level
-        mutable DimensionedField<scalar, volMesh>* V00Ptr_;
+        mutable std::unique_ptr<DimensionedField<scalar, volMesh>> V00Ptr_;
 
         //- Face area vectors
-        mutable slicedSurfaceVectorField* SfPtr_;
+        mutable std::unique_ptr<slicedSurfaceVectorField> SfPtr_;
 
         //- Mag face area vectors
-        mutable surfaceScalarField* magSfPtr_;
+        mutable std::unique_ptr<surfaceScalarField> magSfPtr_;
 
         //- Cell centres
-        mutable slicedVolVectorField* CPtr_;
+        mutable std::unique_ptr<slicedVolVectorField> CPtr_;
 
         //- Face centres
-        mutable slicedSurfaceVectorField* CfPtr_;
+        mutable std::unique_ptr<slicedSurfaceVectorField> CfPtr_;
 
         //- Face motion fluxes
         mutable std::unique_ptr<surfaceScalarField> phiPtr_;
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 57e8322512..13b64832f1 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -51,7 +51,7 @@ void Foam::fvMesh::makeSf() const
             << abort(FatalError);
     }
 
-    SfPtr_ = new slicedSurfaceVectorField
+    SfPtr_ = std::make_unique<slicedSurfaceVectorField>
     (
         IOobject
         (
@@ -88,7 +88,7 @@ void Foam::fvMesh::makeMagSf() const
     // Note: Added stabilisation for faces with exactly zero area.
     // These should be caught on mesh checking but at least this stops
     // the code from producing Nans.
-    magSfPtr_ = new surfaceScalarField
+    magSfPtr_ = std::make_unique<surfaceScalarField>
     (
         IOobject
         (
@@ -120,7 +120,7 @@ void Foam::fvMesh::makeC() const
 
     // Construct as slices. Only preserve processor (not e.g. cyclic)
 
-    CPtr_ = new slicedVolVectorField
+    CPtr_ = std::make_unique<slicedVolVectorField>
     (
         IOobject
         (
@@ -155,7 +155,7 @@ void Foam::fvMesh::makeCf() const
             << abort(FatalError);
     }
 
-    CfPtr_ = new slicedSurfaceVectorField
+    CfPtr_ = std::make_unique<slicedSurfaceVectorField>
     (
         IOobject
         (
@@ -183,7 +183,7 @@ const Foam::volScalarField::Internal& Foam::fvMesh::V() const
         DebugInFunction
             << "Constructing from primitiveMesh::cellVolumes()" << endl;
 
-        VPtr_ = new SlicedDimensionedField<scalar, volMesh>
+        VPtr_ = std::make_unique<SlicedDimensionedField<scalar, volMesh>>
         (
             IOobject
             (
@@ -236,7 +236,7 @@ const Foam::volScalarField::Internal& Foam::fvMesh::V00() const
     {
         DebugInFunction << "Constructing from V0" << endl;
 
-        V00Ptr_ = new DimensionedField<scalar, volMesh>
+        V00Ptr_ = std::make_unique<DimensionedField<scalar, volMesh>>
         (
             IOobject
             (
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weightedFlux/weightedFlux.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weightedFlux/weightedFlux.C
index 2c05456f9c..4f9cf060df 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weightedFlux/weightedFlux.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weightedFlux/weightedFlux.C
@@ -26,15 +26,14 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "weightedFlux.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
 template<class Type>
 void Foam::weightedFlux<Type>::clearOut()
 {
-    deleteDemandDrivenData(oDelta_);
-    deleteDemandDrivenData(nDelta_);
+    oDelta_.reset(nullptr);
+    nDelta_.reset(nullptr);
 }
 
 
@@ -54,7 +53,7 @@ void Foam::weightedFlux<Type>::makeDeltas() const
 {
     const fvMesh& mesh = this->mesh();
 
-    oDelta_ = new surfaceScalarField
+    oDelta_ = std::make_unique<surfaceScalarField>
     (
         IOobject
         (
@@ -67,7 +66,7 @@ void Foam::weightedFlux<Type>::makeDeltas() const
     );
     auto& oDelta = *oDelta_;
 
-    nDelta_ = new surfaceScalarField
+    nDelta_ = std::make_unique<surfaceScalarField>
     (
         IOobject
         (
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weightedFlux/weightedFlux.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weightedFlux/weightedFlux.H
index b0a11e63c9..fc80cc65f3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weightedFlux/weightedFlux.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/weightedFlux/weightedFlux.H
@@ -96,10 +96,10 @@ class weightedFlux
     // Demand-driven data
 
         //- Face to owner cell distance
-        mutable surfaceScalarField* oDelta_;
+        mutable std::unique_ptr<surfaceScalarField> oDelta_;
 
         //- Face to neighbour cell distance
-        mutable surfaceScalarField* nDelta_;
+        mutable std::unique_ptr<surfaceScalarField> nDelta_;
 
 
     // Private Member Functions
diff --git a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
index af18f129c3..f042580489 100644
--- a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,7 +33,6 @@ License
 #include "triSurfaceSearch.H"
 #include "cellClassification.H"
 #include "cpuTime.H"
-#include "demandDrivenData.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -389,8 +388,7 @@ Foam::surfaceToCell::surfaceToCell
     nearDist_(nearDist),
     curvature_(curvature),
     surfPtr_(new triSurface(surfName_)),
-    querySurfPtr_(new triSurfaceSearch(*surfPtr_)),
-    IOwnPtrs_(true)
+    querySurfPtr_(new triSurfaceSearch(*surfPtr_))
 {
     checkSettings();
 }
@@ -420,9 +418,8 @@ Foam::surfaceToCell::surfaceToCell
     useSurfaceOrientation_(useSurfaceOrientation),
     nearDist_(nearDist),
     curvature_(curvature),
-    surfPtr_(&surf),
-    querySurfPtr_(&querySurf),
-    IOwnPtrs_(false)
+    surfPtr_(surf),
+    querySurfPtr_(querySurf)
 {
     checkSettings();
 }
@@ -455,8 +452,7 @@ Foam::surfaceToCell::surfaceToCell
             dict.getOrDefault<scalar>("scale", -1)
         )
     ),
-    querySurfPtr_(new triSurfaceSearch(*surfPtr_)),
-    IOwnPtrs_(true)
+    querySurfPtr_(new triSurfaceSearch(*surfPtr_))
 {
     checkSettings();
 }
@@ -478,8 +474,7 @@ Foam::surfaceToCell::surfaceToCell
     nearDist_(readScalar(checkIs(is))),
     curvature_(readScalar(checkIs(is))),
     surfPtr_(new triSurface(surfName_)),
-    querySurfPtr_(new triSurfaceSearch(*surfPtr_)),
-    IOwnPtrs_(true)
+    querySurfPtr_(new triSurfaceSearch(*surfPtr_))
 {
     checkSettings();
 }
@@ -488,13 +483,7 @@ Foam::surfaceToCell::surfaceToCell
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::surfaceToCell::~surfaceToCell()
-{
-    if (IOwnPtrs_)
-    {
-        deleteDemandDrivenData(surfPtr_);
-        deleteDemandDrivenData(querySurfPtr_);
-    }
-}
+{}  // Define here (incomplete type in header)
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.H b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.H
index 6c3d9b0fd9..758dec7d78 100644
--- a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.H
+++ b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -115,10 +115,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef surfaceToCell_H
-#define surfaceToCell_H
+#ifndef Foam_surfaceToCell_H
+#define Foam_surfaceToCell_H
 
 #include "topoSetCellSource.H"
+#include "refPtr.H"
 #include "Map.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -170,15 +171,11 @@ class surfaceToCell
         //  varying more than curvature_.
         const scalar curvature_;
 
-        //- triSurface to search on. On pointer since can be external.
-        const triSurface* surfPtr_;
+        //- triSurface to search on (can be external reference)
+        const refPtr<triSurface> surfPtr_;
 
         //- Search engine on surface.
-        const triSurfaceSearch* querySurfPtr_;
-
-        //- Whether I allocated above surface ptrs or whether they are
-        //  external.
-        const bool IOwnPtrs_;
+        const refPtr<triSurfaceSearch> querySurfPtr_;
 
 
     // Private Member Functions
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index 827faa279c..e9a964201d 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,6 @@ License
 #include "emptyPolyPatch.H"
 #include "SubField.H"
 #include "meshTools.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -49,8 +48,8 @@ const Foam::scalar Foam::twoDPointCorrector::edgeOrthogonalityTol = 1.0 - 1e-4;
 void Foam::twoDPointCorrector::calcAddressing() const
 {
     // Find geometry normal
-    planeNormalPtr_ = new vector(0, 0, 0);
-    vector& pn = *planeNormalPtr_;
+    planeNormalPtr_ = std::make_unique<vector>(0, 0, 0);
+    auto& pn = *planeNormalPtr_;
 
     // Algorithm:
     // Attempt to find wedge patch and work out the normal from it.
@@ -120,8 +119,8 @@ void Foam::twoDPointCorrector::calcAddressing() const
     }
 
     // Select edges to be included in check.
-    normalEdgeIndicesPtr_ = new labelList(mesh_.nEdges());
-    labelList& neIndices = *normalEdgeIndicesPtr_;
+    normalEdgeIndicesPtr_ = std::make_unique<labelList>(mesh_.nEdges());
+    auto& neIndices = *normalEdgeIndicesPtr_;
 
     const edgeList& meshEdges = mesh_.edges();
 
@@ -176,8 +175,8 @@ void Foam::twoDPointCorrector::calcAddressing() const
 
 void Foam::twoDPointCorrector::clearAddressing() const
 {
-    deleteDemandDrivenData(planeNormalPtr_);
-    deleteDemandDrivenData(normalEdgeIndicesPtr_);
+    planeNormalPtr_.reset(nullptr);
+    normalEdgeIndicesPtr_.reset(nullptr);
 }
 
 
@@ -201,8 +200,6 @@ Foam::twoDPointCorrector::twoDPointCorrector(const polyMesh& mesh)
 :
     MeshObject_type(mesh),
     required_(mesh_.nGeometricD() == 2),
-    planeNormalPtr_(nullptr),
-    normalEdgeIndicesPtr_(nullptr),
     isWedge_(false),
     wedgeAxis_(Zero),
     wedgeAngle_(0.0)
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
index ff9c6195f0..fe7d10ba5e 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef twoDPointCorrector_H
-#define twoDPointCorrector_H
+#ifndef Foam_twoDPointCorrector_H
+#define Foam_twoDPointCorrector_H
 
 #include "MeshObject.H"
 #include "pointField.H"
@@ -80,15 +81,15 @@ class twoDPointCorrector
         //- Is 2D correction required, i.e. is the mesh
         bool required_;
 
-        //- 2-D plane unit normal
-        mutable vector* planeNormalPtr_;
-
-        //- Indices of edges normal to plane
-        mutable labelList* normalEdgeIndicesPtr_;
-
         //- Flag to indicate a wedge geometry
         mutable bool isWedge_;
 
+        //- 2-D plane unit normal
+        mutable std::unique_ptr<vector> planeNormalPtr_;
+
+        //- Indices of edges normal to plane
+        mutable std::unique_ptr<labelList> normalEdgeIndicesPtr_;
+
         //- Wedge axis (if wedge geometry)
         mutable vector wedgeAxis_;
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/interpolation/pointVolInterpolation/pointVolInterpolation.C b/src/optimisation/adjointOptimisation/adjoint/interpolation/pointVolInterpolation/pointVolInterpolation.C
index 8ec4bffe3c..7789879d96 100644
--- a/src/optimisation/adjointOptimisation/adjoint/interpolation/pointVolInterpolation/pointVolInterpolation.C
+++ b/src/optimisation/adjointOptimisation/adjoint/interpolation/pointVolInterpolation/pointVolInterpolation.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) Wikki Ltd
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,6 @@ License
 #include "volFields.H"
 #include "emptyFvPatch.H"
 #include "SubField.H"
-#include "demandDrivenData.H"
 #include "globalMeshData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -66,15 +65,17 @@ void Foam::pointVolInterpolation::makeWeights() const
     const vectorField& cellCentres = vMesh().cellCentres();
 
     // Allocate storage for weighting factors
-    volWeightsPtr_ = new FieldField<Field, scalar>(cellCentres.size());
-    FieldField<Field, scalar>& weightingFactors = *volWeightsPtr_;
+    volWeightsPtr_ =
+        std::make_unique<FieldField<Field, scalar>>(cellCentres.size());
+
+    auto& weightingFactors = *volWeightsPtr_;
 
     forAll(weightingFactors, pointi)
     {
-        weightingFactors.set
+        weightingFactors.emplace_set
         (
             pointi,
-            new scalarField(cellPoints[pointi].size())
+            cellPoints[pointi].size()
         );
     }
 
@@ -130,38 +131,37 @@ void Foam::pointVolInterpolation::makeWeights() const
 // Do what is necessary if the mesh has changed topology
 void Foam::pointVolInterpolation::clearAddressing() const
 {
-    deleteDemandDrivenData(patchInterpolatorsPtr_);
+    patchInterpolators_.clear();
 }
 
 
 // Do what is necessary if the mesh has moved
 void Foam::pointVolInterpolation::clearGeom() const
 {
-    deleteDemandDrivenData(volWeightsPtr_);
+    volWeightsPtr_.reset(nullptr);
 }
 
 
 const Foam::PtrList<Foam::primitivePatchInterpolation>&
 Foam::pointVolInterpolation::patchInterpolators() const
 {
-    if (!patchInterpolatorsPtr_)
+    if (patchInterpolators_.empty())
     {
         const fvBoundaryMesh& bdry = vMesh().boundary();
 
-        patchInterpolatorsPtr_ =
-            new PtrList<primitivePatchInterpolation>(bdry.size());
+        patchInterpolators_.resize(bdry.size());
 
-        forAll(bdry, patchI)
+        forAll(bdry, patchi)
         {
-            patchInterpolatorsPtr_->set
+            patchInterpolators_.emplace_set
             (
-                patchI,
-                new primitivePatchInterpolation(bdry[patchI].patch())
+                patchi,
+                bdry[patchi].patch()
             );
         }
     }
 
-    return *patchInterpolatorsPtr_;
+    return patchInterpolators_;
 }
 
 
@@ -169,14 +169,12 @@ Foam::pointVolInterpolation::patchInterpolators() const
 
 Foam::pointVolInterpolation::pointVolInterpolation
 (
- const pointMesh& pm,
+    const pointMesh& pm,
     const fvMesh& vm
 )
 :
     pointMesh_(pm),
-    fvMesh_(vm),
-    volWeightsPtr_(nullptr),
-    patchInterpolatorsPtr_(nullptr)
+    fvMesh_(vm)
 {}
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/interpolation/pointVolInterpolation/pointVolInterpolation.H b/src/optimisation/adjointOptimisation/adjoint/interpolation/pointVolInterpolation/pointVolInterpolation.H
index b3372d82ba..c3fc569529 100644
--- a/src/optimisation/adjointOptimisation/adjoint/interpolation/pointVolInterpolation/pointVolInterpolation.H
+++ b/src/optimisation/adjointOptimisation/adjoint/interpolation/pointVolInterpolation/pointVolInterpolation.H
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef pointVolInterpolation_H
-#define pointVolInterpolation_H
+#ifndef Foam_pointVolInterpolation_H
+#define Foam_pointVolInterpolation_H
 
 #include "primitiveFieldsFwd.H"
 #include "primitivePatchInterpolation.H"
@@ -66,16 +66,17 @@ class pointVolInterpolation
     // Private Data
 
         const pointMesh& pointMesh_;
+
         const fvMesh& fvMesh_;
 
         //- Interpolation scheme weighting factor array.
-        mutable FieldField<Field, scalar>* volWeightsPtr_;
+        mutable std::unique_ptr<FieldField<Field, scalar>> volWeightsPtr_;
 
         //- Primitive patch interpolators
-        mutable PtrList<primitivePatchInterpolation>* patchInterpolatorsPtr_;
+        mutable PtrList<primitivePatchInterpolation> patchInterpolators_;
 
 
-    // Private member functions
+    // Private Member Functions
 
         //- Return patch interpolators
         const PtrList<primitivePatchInterpolation>& patchInterpolators() const;
@@ -92,15 +93,9 @@ class pointVolInterpolation
 
 protected:
 
-        const pointMesh& pMesh() const
-        {
-            return pointMesh_;
-        }
+        const pointMesh& pMesh() const noexcept { return pointMesh_; }
 
-        const fvMesh& vMesh() const
-        {
-            return fvMesh_;
-        }
+        const fvMesh& vMesh() const noexcept { return fvMesh_; }
 
 
 public:
@@ -119,7 +114,7 @@ public:
     ~pointVolInterpolation();
 
 
-    // Member functions
+    // Member Functions
 
         // Access
 
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 411bb59ba4..6edc405825 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,7 +33,6 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "mapPolyMesh.H"
 #include "unitConversion.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -186,8 +185,8 @@ void Foam::mixerFvMesh::calcMovingMasks() const
     }
 
     // Set the point mask
-    movingPointsMaskPtr_ = new scalarField(points().size(), Zero);
-    scalarField& movingPointsMask = *movingPointsMaskPtr_;
+    movingPointsMaskPtr_ = std::make_unique<scalarField>(points().size(), Zero);
+    auto& movingPointsMask = *movingPointsMaskPtr_;
 
     const cellList& c = cells();
     const faceList& f = faces();
@@ -267,9 +266,7 @@ Foam::mixerFvMesh::mixerFvMesh
             )
         ).optionalSubDict(typeName + "Coeffs")
     ),
-    csys_(),
-    rpm_(motionDict_.get<scalar>("rpm")),
-    movingPointsMaskPtr_(nullptr)
+    rpm_(motionDict_.get<scalar>("rpm"))
 {
     // New() for access to indirect (global) coordSystem.
 
@@ -277,7 +274,7 @@ Foam::mixerFvMesh::mixerFvMesh
 
     if (csysPtr)
     {
-        static_cast<coordinateSystem&>(csys_) = csysPtr();
+        static_cast<coordinateSystem&>(csys_) = *csysPtr;
     }
     else
     {
@@ -297,7 +294,7 @@ Foam::mixerFvMesh::mixerFvMesh
 
 Foam::mixerFvMesh::~mixerFvMesh()
 {
-    deleteDemandDrivenData(movingPointsMaskPtr_);
+    movingPointsMaskPtr_.reset(nullptr);
 }
 
 
@@ -337,7 +334,7 @@ bool Foam::mixerFvMesh::update()
     {
         DebugInFunction << "Mesh topology is changing" << nl;
 
-        deleteDemandDrivenData(movingPointsMaskPtr_);
+        movingPointsMaskPtr_.reset(nullptr);
     }
 
     movePoints
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
index c95f7243b5..0697bd5865 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
@@ -65,7 +65,7 @@ class mixerFvMesh
         scalar rpm_;
 
         //- Markup field for points.  Moving points marked with 1
-        mutable scalarField* movingPointsMaskPtr_;
+        mutable std::unique_ptr<scalarField> movingPointsMaskPtr_;
 
 
     // Private Member Functions