diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index ae658b0af1..68f4c82589 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -1243,7 +1243,7 @@ int main(int argc, char *argv[])
     // Add all points
     forAll(points, pointi)
     {
-        meshMod.addPoint(points[pointi], pointi, -1, true);
+        meshMod.addPoint(points[pointi], pointi, true);
     }
     points.setSize(0);
 
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
index 174db26e75..7ef48e1d1b 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
@@ -42,7 +42,6 @@ Description
 #include "polyTopoChange.H"
 #include "MeshedSurface.H"
 #include "edgeCollapser.H"
-#include "addPatchCellLayer.H"
 #include "patchToPoly2DMesh.H"
 #include "globalIndex.H"
 #include "IOdictionary.H"
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
index 0e7096c2d0..c98b35747a 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
@@ -238,7 +238,6 @@ void Foam::extrude2DMesh::setRefinement
             (
                 newPoint,
                 pointi + offset,
-                -1,             // zoneID
                 true            // inCell
             );
         }
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
index 24ffb2aa05..f4e9207a6d 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
@@ -628,6 +628,8 @@ int main(int argc, char *argv[])
             mesh
         );
 
+        layerExtrude.updateZones(meshFromMesh());
+
         layerExtrude.topoChange
         (
             map(),
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
index cf789edae8..825d0320d9 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@@ -153,6 +153,8 @@ Foam::mergePolyMesh::mergePolyMesh(polyMesh& mesh)
         pointZoneNames_.append(curPointZoneNames[zoneI]);
     }
 
+    pointZonesAddedPoints_.setSize(pointZoneNames_.size());
+
     // Face zones
     wordList curFaceZoneNames = mesh_.faceZones().names();
 
@@ -201,26 +203,26 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
     forAll(pz, zoneI)
     {
         pointZoneIndices[zoneI] = zoneIndex(pointZoneNames_, pz[zoneI].name());
+        pointZonesAddedPoints_.setSize(pointZoneNames_.size());
     }
 
     forAll(p, pointi)
     {
+        renumberPoints[pointi] = meshMod_.addPoint
+        (
+            p[pointi],            // Point to add
+            -1,                   // Master point (straight addition)
+            pointi < m.nPoints()  // Is in cell?
+        );
+
         // Grab zone ID.  If a point is not in a zone, it will return -1
         zoneID = pz.whichZone(pointi);
 
         if (zoneID >= 0)
         {
-            // Translate zone ID into the new index
-            zoneID = pointZoneIndices[zoneID];
+            pointZonesAddedPoints_[pointZoneIndices[zoneID]]
+           .insert(renumberPoints[pointi]);
         }
-
-        renumberPoints[pointi] = meshMod_.addPoint
-        (
-            p[pointi],            // Point to add
-            -1,                   // Master point (straight addition)
-            zoneID,               // Zone for point
-            pointi < m.nPoints()  // Is in cell?
-        );
     }
 
     // Add cells
@@ -509,6 +511,12 @@ void Foam::mergePolyMesh::merge()
 
     // Clear topo change for the next operation
     meshMod_.clear();
+
+    // Add the new points to the pointZones in the merged mesh
+    forAll(pointZonesAddedPoints_, zonei)
+    {
+        mesh_.pointZones()[zonei].insert(pointZonesAddedPoints_[zonei]);
+    }
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
index 1d055b577d..461d63bce9 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
@@ -66,6 +66,9 @@ class mergePolyMesh
         //- Point zone names
         DynamicList<word> pointZoneNames_;
 
+        //- Zones of the added points
+        List<labelHashSet> pointZonesAddedPoints_;
+
         //- Face zone names
         DynamicList<word> faceZoneNames_;
 
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index 77064e27e7..9e8164f244 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -127,7 +127,6 @@ void Foam::meshDualiser::generateDualBoundaryEdges
             (
                 e.centre(mesh_.points()),
                 pointi, // masterPoint
-                -1,     // zoneID
                 true    // inCell
             );
         }
@@ -177,20 +176,6 @@ Foam::label Foam::meshDualiser::addInternalFace
         reverse(newFace);
     }
 
-    label zoneID = -1;
-    bool zoneFlip = false;
-    if (masterFacei != -1)
-    {
-        zoneID = mesh_.faceZones().whichZone(masterFacei);
-
-        if (zoneID != -1)
-        {
-            const faceZone& fZone = mesh_.faceZones()[zoneID];
-
-            zoneFlip = fZone.flipMap()[fZone.whichFace(masterFacei)];
-        }
-    }
-
     label dualFacei;
 
     if (dualCell0 < dualCell1)
@@ -203,8 +188,8 @@ Foam::label Foam::meshDualiser::addInternalFace
             masterFacei,    // masterFaceID
             false,          // flipFaceFlux
             -1,             // patchID
-            zoneID,         // zoneID
-            zoneFlip        // zoneFlip
+            -1,             // zoneID
+            false           // zoneFlip
         );
 
         // pointField dualPoints(meshMod.points());
@@ -228,8 +213,8 @@ Foam::label Foam::meshDualiser::addInternalFace
             masterFacei,    // masterFaceID
             false,          // flipFaceFlux
             -1,             // patchID
-            zoneID,         // zoneID
-            zoneFlip        // zoneFlip
+            -1,             // zoneID
+            false           // zoneFlip
         );
 
         // pointField dualPoints(meshMod.points());
@@ -261,20 +246,6 @@ Foam::label Foam::meshDualiser::addBoundaryFace
 {
     face newFace(verts);
 
-    label zoneID = -1;
-    bool zoneFlip = false;
-    if (masterFacei != -1)
-    {
-        zoneID = mesh_.faceZones().whichZone(masterFacei);
-
-        if (zoneID != -1)
-        {
-            const faceZone& fZone = mesh_.faceZones()[zoneID];
-
-            zoneFlip = fZone.flipMap()[fZone.whichFace(masterFacei)];
-        }
-    }
-
     label dualFacei = meshMod.addFace
     (
         newFace,
@@ -283,8 +254,8 @@ Foam::label Foam::meshDualiser::addBoundaryFace
         masterFacei,    // masterFaceID
         false,          // flipFaceFlux
         patchi,         // patchID
-        zoneID,         // zoneID
-        zoneFlip        // zoneFlip
+        -1,             // zoneID
+        false           // zoneFlip
     );
 
     // pointField dualPoints(meshMod.points());
@@ -955,7 +926,6 @@ void Foam::meshDualiser::setRefinement
         (
             mesh_.points()[pointi],
             pointi,                                 // masterPoint
-            mesh_.pointZones().whichZone(pointi),   // zoneID
             true                                    // inCell
         );
 
@@ -990,7 +960,6 @@ void Foam::meshDualiser::setRefinement
         (
             mesh_.points()[pointi],
             pointi,                                 // masterPoint
-            mesh_.pointZones().whichZone(pointi),   // zoneID
             true                                    // inCell
         );
 
@@ -1005,7 +974,7 @@ void Foam::meshDualiser::setRefinement
             pointToDualCells_[pointi][pCelli] = meshMod.addCell
             (
                 -1,                                         // masterCellID
-                mesh_.cellZones().whichZone(pCells[pCelli]) // zoneID
+                -1
             );
             if (dualCcStr.valid())
             {
@@ -1046,7 +1015,6 @@ void Foam::meshDualiser::setRefinement
         (
             cellCentres[celli],
             mesh_.faces()[mesh_.cells()[celli][0]][0],     // masterPoint
-            -1,     // zoneID
             true    // inCell
         );
     }
@@ -1061,7 +1029,6 @@ void Foam::meshDualiser::setRefinement
         (
             mesh_.faceCentres()[facei],
             mesh_.faces()[facei][0],     // masterPoint
-            -1,     // zoneID
             true    // inCell
         );
     }
@@ -1085,7 +1052,6 @@ void Foam::meshDualiser::setRefinement
                     (
                         mesh_.faceCentres()[facei],
                         f[fp],  // masterPoint
-                        -1,     // zoneID
                         true    // inCell
                     );
 
@@ -1107,7 +1073,6 @@ void Foam::meshDualiser::setRefinement
         (
             e.centre(mesh_.points()),
             e[0],   // masterPoint
-            -1,     // zoneID
             true    // inCell
         );
     }
@@ -1142,7 +1107,6 @@ void Foam::meshDualiser::setRefinement
                     (
                         e.centre(mesh_.points()),
                         e[0],                               // masterPoint
-                        mesh_.pointZones().whichZone(e[0]), // zoneID
                         true                                // inCell
                     );
 
@@ -1157,7 +1121,6 @@ void Foam::meshDualiser::setRefinement
                     (
                         e.centre(mesh_.points()),
                         e[1],   // masterPoint
-                        mesh_.pointZones().whichZone(e[1]), // zoneID
                         true    // inCell
                     );
 
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
index 28d0a91b4e..c5158a1318 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
@@ -422,6 +422,14 @@ int main(int argc, char *argv[])
     }
 
 
+    mesh.cellZones().clear();
+    mesh.pointZones().clear();
+
+    if (doNotPreserveFaceZones)
+    {
+        mesh.faceZones().clear();
+    }
+
     // Face(centre)s that need inclusion in the dual mesh
     labelList featureFaces;
     // Edge(centre)s  ,,
@@ -446,6 +454,8 @@ int main(int argc, char *argv[])
         multiCellFeaturePoints
     );
 
+    mesh.faceZones().clear();
+
     // If we want to split all polyMesh faces into one dualface per cell
     // we are passing through we also need a point
     // at the polyMesh facecentre and edgemid of the faces we want to
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
index 8c7267cb08..61edceec72 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
@@ -24,12 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cellZone.H"
-#include "addToRunTimeSelectionTable.H"
 #include "meshCellZones.H"
 #include "polyMesh.H"
-#include "primitiveMesh.H"
-#include "IOstream.H"
-#include "demandDrivenData.H"
+#include "polyTopoChangeMap.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -130,6 +128,33 @@ bool Foam::cellZone::checkDefinition(const bool report) const
 }
 
 
+void Foam::cellZone::topoChange(const polyTopoChangeMap& map)
+{
+    clearAddressing();
+
+    /*
+    labelList newAddressing(size());
+    label nCells = 0;
+
+    const labelList& cellMap = map.reverseCellMap();
+
+    forAll(*this, i)
+    {
+        const label celli = operator[](i);
+
+        if (cellMap[celli] >= 0)
+        {
+            newAddressing[nCells] = cellMap[celli];
+            nCells++;
+        }
+    }
+
+    newAddressing.setSize(nCells);
+    transfer(newAddressing);
+    */
+}
+
+
 void Foam::cellZone::writeDict(Ostream& os) const
 {
     os  << nl << name() << nl << token::BEGIN_BLOCK << nl
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index a728f7d548..f7b3b490ec 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -200,6 +200,9 @@ public:
             return false;
         }
 
+        //- Update zone using the given map
+        virtual void topoChange(const polyTopoChangeMap& map);
+
         //- Write dictionary
         virtual void writeDict(Ostream&) const;
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 7e92f41284..4d38379168 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -24,14 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "faceZone.H"
-#include "addToRunTimeSelectionTable.H"
 #include "meshFaceZones.H"
 #include "polyMesh.H"
-#include "primitiveMesh.H"
-#include "demandDrivenData.H"
 #include "polyTopoChangeMap.H"
-#include "polyMeshMap.H"
 #include "syncTools.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -382,38 +379,6 @@ void Foam::faceZone::resetAddressing
 }
 
 
-void Foam::faceZone::topoChange(const polyTopoChangeMap& map)
-{
-    clearAddressing();
-
-    /*
-    labelList newAddressing(size());
-    boolList newFlipMap(flipMap_.size());
-    label nFaces = 0;
-
-    const labelList& faceMap = map.reverseFaceMap();
-
-    forAll(*this, i)
-    {
-        const label facei = operator[](i);
-
-        if (faceMap[facei] >= 0)
-        {
-            newAddressing[nFaces] = faceMap[facei];
-            newFlipMap[nFaces] = flipMap_[i];       // Keep flip map.
-            nFaces++;
-        }
-    }
-
-    newAddressing.setSize(nFaces);
-    newFlipMap.setSize(nFaces);
-
-    transfer(newAddressing);
-    flipMap_.transfer(newFlipMap);
-    */
-}
-
-
 bool Foam::faceZone::checkDefinition(const bool report) const
 {
     return zone::checkDefinition(meshZones().mesh().faces().size(), report);
@@ -514,6 +479,38 @@ void Foam::faceZone::swap(faceZone& fz)
 }
 
 
+void Foam::faceZone::topoChange(const polyTopoChangeMap& map)
+{
+    clearAddressing();
+
+    /*
+    labelList newAddressing(size());
+    boolList newFlipMap(flipMap_.size());
+    label nFaces = 0;
+
+    const labelList& faceMap = map.reverseFaceMap();
+
+    forAll(*this, i)
+    {
+        const label facei = operator[](i);
+
+        if (faceMap[facei] >= 0)
+        {
+            newAddressing[nFaces] = faceMap[facei];
+            newFlipMap[nFaces] = flipMap_[i];       // Keep flip map.
+            nFaces++;
+        }
+    }
+
+    newAddressing.setSize(nFaces);
+    newFlipMap.setSize(nFaces);
+
+    transfer(newAddressing);
+    flipMap_.transfer(newFlipMap);
+    */
+}
+
+
 void Foam::faceZone::movePoints(const pointField& p)
 {
     if (patchPtr_)
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 9dab0e5b07..6058003782 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -283,7 +283,7 @@ public:
         //- Correct patch after moving points
         virtual void movePoints(const pointField&);
 
-        //- Update topology using the given map
+        //- Update zone using the given map
         virtual void topoChange(const polyTopoChangeMap&);
 
         //- Write
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
index e02e8c42f2..32c87364e2 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
@@ -24,12 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "pointZone.H"
-#include "addToRunTimeSelectionTable.H"
 #include "meshPointZones.H"
 #include "polyMesh.H"
-#include "primitiveMesh.H"
-#include "demandDrivenData.H"
+#include "polyTopoChangeMap.H"
 #include "syncTools.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -182,6 +181,31 @@ bool Foam::pointZone::checkParallelSync(const bool report) const
 }
 
 
+void Foam::pointZone::topoChange(const polyTopoChangeMap& map)
+{
+    clearAddressing();
+
+    labelList newAddressing(size());
+    label nPoints = 0;
+
+    const labelList& pointMap = map.reversePointMap();
+
+    forAll(*this, i)
+    {
+        const label pointi = operator[](i);
+
+        if (pointMap[pointi] >= 0)
+        {
+            newAddressing[nPoints] = pointMap[pointi];
+            nPoints++;
+        }
+    }
+
+    newAddressing.setSize(nPoints);
+    transfer(newAddressing);
+}
+
+
 void Foam::pointZone::writeDict(Ostream& os) const
 {
     os  << nl << name_ << nl << token::BEGIN_BLOCK << nl
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 29bc4d5ffe..65ed58e0cd 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -198,6 +198,9 @@ public:
         //  true if in error.
         virtual bool checkParallelSync(const bool report = false) const;
 
+        //- Update zone using the given map
+        virtual void topoChange(const polyTopoChangeMap& map);
+
         //- Write dictionary
         virtual void writeDict(Ostream&) const;
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
index 325574d1a4..2dd6348d2f 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
@@ -220,20 +220,14 @@ bool Foam::zone::checkDefinition(const label maxSize, const bool report) const
 }
 
 
-void Foam::zone::insert(const HashSet<label>& newIndices)
+void Foam::zone::insert(const labelHashSet& newIndices)
 {
-    HashSet<label> indices(*this);
+    labelHashSet indices(*this);
     indices.insert(newIndices);
     labelList::operator=(indices.sortedToc());
 }
 
 
-void Foam::zone::topoChange(const polyTopoChangeMap& map)
-{
-    clearAddressing();
-}
-
-
 void Foam::zone::mapMesh(const polyMeshMap&)
 {
     clearAddressing();
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
index 60ba48501b..4c3450f42c 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
@@ -168,14 +168,14 @@ public:
         ) const;
 
         //- Insert given indices into zone
-        void insert(const HashSet<label>& newIndices);
+        void insert(const labelHashSet& newIndices);
 
         //- Correct patch after moving points
         virtual void movePoints(const pointField&)
         {}
 
-        //- Update topology using the given map
-        virtual void topoChange(const polyTopoChangeMap& map);
+        //- Update zone using the given map
+        virtual void topoChange(const polyTopoChangeMap& map) = 0;
 
         //- Update from another mesh using the given map
         virtual void mapMesh(const polyMeshMap&);
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index a5fc203285..64276491d9 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -2999,7 +2999,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::meshRefinement::zonify
 
     // Put the cells into the correct zone
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    List<HashSet<label>> cellZoneNewCells(mesh_.cellZones().size());
+    List<labelHashSet> cellZoneNewCells(mesh_.cellZones().size());
     forAll(cellToZone, celli)
     {
         const label zonei = cellToZone[celli];
diff --git a/src/polyTopoChange/createShellMesh/createShellMesh.C b/src/polyTopoChange/createShellMesh/createShellMesh.C
index 919f5cbacb..110ee70b6a 100644
--- a/src/polyTopoChange/createShellMesh/createShellMesh.C
+++ b/src/polyTopoChange/createShellMesh/createShellMesh.C
@@ -522,7 +522,6 @@ void Foam::createShellMesh::setRefinement
         (
             patch_.localPoints()[pointi],   // point
             pointToPointMap.size(),         // masterPointID
-            -1,                             // zoneID
             true                            // inCell
         );
         pointToPointMap.append(pointi);
@@ -552,7 +551,6 @@ void Foam::createShellMesh::setRefinement
             (
                 pt,                     // point
                 pointToPointMap.size(), // masterPointID - used only addressing
-                -1,                     // zoneID
                 true                    // inCell
             );
             pointToPointMap.append(pointi);
diff --git a/src/polyTopoChange/mergePatchPairs/mergePatchPairs.C b/src/polyTopoChange/mergePatchPairs/mergePatchPairs.C
index a9090a1bc7..dcc458a56a 100644
--- a/src/polyTopoChange/mergePatchPairs/mergePatchPairs.C
+++ b/src/polyTopoChange/mergePatchPairs/mergePatchPairs.C
@@ -129,7 +129,6 @@ void Foam::mergePatchPairs::addPoints
         (
             intersectionPoints[pi],
             -1,
-            -1,
             false
         );
 
diff --git a/src/polyTopoChange/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/polyTopoChange/meshCut/meshModifiers/meshCutter/meshCutter.C
index 0f70a4433b..9c07549914 100644
--- a/src/polyTopoChange/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/polyTopoChange/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -581,7 +581,6 @@ void Foam::meshCutter::setRefinement
             (
                 newPt,              // point
                 masterPointi,       // master point
-                -1,                 // zone for point
                 true                // supports a cell
             );
 
diff --git a/src/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index fdfcc64b69..867d1d9c92 100644
--- a/src/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -231,7 +231,7 @@ Foam::label Foam::addPatchCellLayer::addSideFace
 
     // Zone info comes from any side patch face. Otherwise -1 since we
     // don't know what to put it in - inherit from the extruded faces?
-    label zoneI = -1;   // mesh_.faceZones().whichZone(meshFacei);
+    label zonei = -1;   // mesh_.faceZones().whichZone(meshFacei);
     bool flip = false;
 
     label addedFacei = -1;
@@ -262,11 +262,11 @@ Foam::label Foam::addPatchCellLayer::addSideFace
                 // Found the patch face. Use it to map from
                 masterFacei = facei;
 
-                zoneI = mesh_.faceZones().whichZone(facei);
-                if (zoneI != -1)
+                zonei = mesh_.faceZones().whichZone(facei);
+                if (zonei != -1)
                 {
-                    label index = mesh_.faceZones()[zoneI].whichFace(facei);
-                    flip = mesh_.faceZones()[zoneI].flipMap()[index];
+                    label index = mesh_.faceZones()[zonei].whichFace(facei);
+                    flip = mesh_.faceZones()[zonei].flipMap()[index];
                 }
                 break;
             }
@@ -309,7 +309,7 @@ Foam::label Foam::addPatchCellLayer::addSideFace
             masterFacei,                // master face
             false,                      // flux flip
             newPatchID,                 // patch for face
-            zoneI,                      // zone for face
+            zonei,                      // zone for face
             flip                        // face zone flip
         );
     }
@@ -370,7 +370,7 @@ Foam::label Foam::addPatchCellLayer::addSideFace
             -1,                         // master face
             false,                      // flux flip
             -1,                         // patch for face
-            zoneI,                      // zone for face
+            zonei,                      // zone for face
             flip                        // face zone flip
         );
 
@@ -420,6 +420,7 @@ Foam::addPatchCellLayer::addPatchCellLayer
     mesh_(mesh),
     addToMesh_(addToMesh),
     addedPoints_(0),
+    pointZonesAddedPoints_(mesh.pointZones().size()),
     layerFaces_(0)
 {}
 
@@ -999,15 +1000,24 @@ void Foam::addPatchCellLayer::setRefinement
         {
             if (addedPoints_[patchPointi].size())
             {
-                label meshPointi = meshPoints[patchPointi];
-                label zoneI = mesh_.pointZones().whichZone(meshPointi);
+                const label meshPointi = meshPoints[patchPointi];
+
                 copiedPatchPoints[patchPointi] = meshMod.addPoint
                 (
-                    mesh_.points()[meshPointi],         // point
-                    -1,         // master point
-                    zoneI,      // zone for point
-                    true        // supports a cell
+                    mesh_.points()[meshPointi], // point
+                    -1,                         // master point
+                    true                        // supports a cell
                 );
+
+                const label zonei = mesh_.pointZones().whichZone(meshPointi);
+
+                if (zonei != -1)
+                {
+                    pointZonesAddedPoints_[zonei].insert
+                    (
+                        copiedPatchPoints[patchPointi]
+                    );
+                }
             }
         }
     }
@@ -1018,28 +1028,31 @@ void Foam::addPatchCellLayer::setRefinement
     {
         if (addedPoints_[patchPointi].size())
         {
-            label meshPointi = meshPoints[patchPointi];
-
-            label zoneI = mesh_.pointZones().whichZone(meshPointi);
+            const label meshPointi = meshPoints[patchPointi];
 
             point pt = mesh_.points()[meshPointi];
-
             vector disp = firstLayerDisp[patchPointi];
 
+            const label zonei = mesh_.pointZones().whichZone(meshPointi);
+
             forAll(addedPoints_[patchPointi], i)
             {
                 pt += disp;
 
-                label addedVertI = meshMod.addPoint
+                const label addedVertI = meshMod.addPoint
                 (
-                    pt,         // point
+                    pt,                             // point
                     (addToMesh_ ? meshPointi : -1), // master point
-                    zoneI,      // zone for point
-                    true        // supports a cell
+                    true                            // supports a cell
                 );
 
                 addedPoints_[patchPointi][i] = addedVertI;
 
+                if (zonei != -1)
+                {
+                    pointZonesAddedPoints_[zonei].insert(addedVertI);
+                }
+
                 disp *= expansionRatio[patchPointi];
             }
         }
@@ -1071,8 +1084,7 @@ void Foam::addPatchCellLayer::setRefinement
                 // for now add from cell so we can map easily.
                 addedCells[patchFacei][i] = meshMod.addCell
                 (
-                    (addToMesh_ ? mesh_.faceOwner()[meshFacei] : -1),
-                    // master
+                    (addToMesh_ ? mesh_.faceOwner()[meshFacei] : -1), // master
                     ownZoneI        // zone for cell
                 );
             }
@@ -1129,7 +1141,7 @@ void Foam::addPatchCellLayer::setRefinement
                 // Get new neighbour
                 label nei;
                 label patchi;
-                label zoneI = -1;
+                label zonei = -1;
                 bool flip = false;
 
 
@@ -1138,10 +1150,10 @@ void Foam::addPatchCellLayer::setRefinement
                     // Top layer so is patch face.
                     nei = -1;
                     patchi = patchID[patchFacei];
-                    zoneI = mesh_.faceZones().whichZone(meshFacei);
-                    if (zoneI != -1)
+                    zonei = mesh_.faceZones().whichZone(meshFacei);
+                    if (zonei != -1)
                     {
-                        const faceZone& fz = mesh_.faceZones()[zoneI];
+                        const faceZone& fz = mesh_.faceZones()[zonei];
                         flip = fz.flipMap()[fz.whichFace(meshFacei)];
                     }
                 }
@@ -1161,7 +1173,7 @@ void Foam::addPatchCellLayer::setRefinement
                     (addToMesh_ ? meshFacei : -1), // master face
                     false,                      // flux flip
                     patchi,                     // patch for face
-                    zoneI,                      // zone for face
+                    zonei,                      // zone for face
                     flip                        // face zone flip
                 );
             }
@@ -1190,7 +1202,7 @@ void Foam::addPatchCellLayer::setRefinement
                     addedCells[patchFacei][0],      // neighbour
                     false,                          // face flip
                     -1,                             // patch for face
-                    -1, // zoneI,                    // zone for face
+                    -1, // zonei,                    // zone for face
                     false                           // face flip in zone
                 );
             }
@@ -1205,11 +1217,11 @@ void Foam::addPatchCellLayer::setRefinement
             if (nFaceLayers[patchFacei] > 0)
             {
                 label meshFacei = pp.addressing()[patchFacei];
-                label zoneI = mesh_.faceZones().whichZone(meshFacei);
+                label zonei = mesh_.faceZones().whichZone(meshFacei);
                 bool zoneFlip = false;
-                if (zoneI != -1)
+                if (zonei != -1)
                 {
-                    const faceZone& fz = mesh_.faceZones()[zoneI];
+                    const faceZone& fz = mesh_.faceZones()[zonei];
                     zoneFlip = !fz.flipMap()[fz.whichFace(meshFacei)];
                 }
 
@@ -1228,7 +1240,7 @@ void Foam::addPatchCellLayer::setRefinement
                     -1,                         // masterFace
                     true,                       // face flip
                     exposedPatchID[patchFacei], // patch for face
-                    zoneI,                      // zone for face
+                    zonei,                      // zone for face
                     zoneFlip                    // face flip in zone
                 );
             }
@@ -1665,4 +1677,14 @@ void Foam::addPatchCellLayer::topoChange
 }
 
 
+void Foam::addPatchCellLayer::updateZones(polyMesh& mesh)
+{
+    // Add the pointZones to the merged mesh
+    forAll(pointZonesAddedPoints_, zonei)
+    {
+        mesh.pointZones()[zonei].insert(pointZonesAddedPoints_[zonei]);
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index 1ab2692f45..53df0596c3 100644
--- a/src/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -172,6 +172,9 @@ class addPatchCellLayer
         //  last one is the new point on the surface.
         labelListList addedPoints_;
 
+        //- Zones of the added points
+        List<labelHashSet> pointZonesAddedPoints_;
+
         //- For all patchfaces: list of layer faces.
         //  - empty if no face extruded
         //  - first face is original boundary face
@@ -386,6 +389,10 @@ public:
                 const labelList& pointMap   // new to old patch points
             );
 
+            //- Update the mesh zones
+            //  adding the point and cell zones for the added layer
+            void updateZones(polyMesh& mesh);
+
 
     // Member Operators
 
diff --git a/src/polyTopoChange/polyTopoChange/combineFaces.C b/src/polyTopoChange/polyTopoChange/combineFaces.C
index 5d0a8941aa..8d89506cf5 100644
--- a/src/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/polyTopoChange/polyTopoChange/combineFaces.C
@@ -904,7 +904,6 @@ void Foam::combineFaces::setUnrefinement
                         (
                             savedPoints_[localI],   // point
                             -1,                     // master point
-                            -1,                     // zone for point
                             true                    // supports a cell
                         );
                         restoredPoints.insert
diff --git a/src/polyTopoChange/polyTopoChange/duplicatePoints.C b/src/polyTopoChange/polyTopoChange/duplicatePoints.C
index 012f788ca1..b035ad262d 100644
--- a/src/polyTopoChange/polyTopoChange/duplicatePoints.C
+++ b/src/polyTopoChange/polyTopoChange/duplicatePoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,9 +83,8 @@ void Foam::duplicatePoints::setRefinement
         {
             duplicates_[localI][i] = meshMod.addPoint
             (
-                mesh_.points()[pointi],  // point
+                mesh_.points()[pointi], // point
                 pointi,                 // master point
-                -1,                     // zone for point
                 true                    // supports a cell
             );
         }
diff --git a/src/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/polyTopoChange/polyTopoChange/edgeCollapser.C
index e854ce2fe7..1635c46b28 100644
--- a/src/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1258,10 +1258,6 @@ bool Foam::edgeCollapser::setRefinement
     const labelList& faceOwner = mesh_.faceOwner();
     const labelList& faceNeighbour = mesh_.faceNeighbour();
     const labelListList& pointFaces = mesh_.pointFaces();
-    const meshPointZones& pointZones = mesh_.pointZones();
-
-
-
 
 //    // Dump point collapses
 //    label count = 0;
@@ -1547,7 +1543,6 @@ bool Foam::edgeCollapser::setRefinement
             (
                 pointi,
                 collapsePoint,
-                pointZones.whichZone(pointi),
                 false
             );
         }
diff --git a/src/polyTopoChange/polyTopoChange/edgeCollapser.H b/src/polyTopoChange/polyTopoChange/edgeCollapser.H
index 6c23da439c..8d3e8ef30e 100644
--- a/src/polyTopoChange/polyTopoChange/edgeCollapser.H
+++ b/src/polyTopoChange/polyTopoChange/edgeCollapser.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -259,7 +259,7 @@ public:
         // Check
 
             //- Calls meshCheck::checkMesh and returns a set of bad faces
-            static HashSet<label> checkBadFaces
+            static labelHashSet checkBadFaces
             (
                 const polyMesh& mesh,
                 const dictionary& meshQualityDict
diff --git a/src/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index cf3313e84a..f07fd9afce 100644
--- a/src/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -3175,7 +3175,6 @@ Foam::labelListList Foam::hexRef8::setRefinement
         (
             mesh_.cellCentres()[celli],     // point
             anchorPointi,                   // master point
-            -1,                             // zone for point
             true                            // supports a cell
         );
 
@@ -3298,7 +3297,6 @@ Foam::labelListList Foam::hexRef8::setRefinement
                 (
                     edgeMids[edgeI],            // point
                     e[0],                       // master point
-                    -1,                         // zone for point
                     true                        // supports a cell
                 );
 
@@ -3484,7 +3482,6 @@ Foam::labelListList Foam::hexRef8::setRefinement
                         : bFaceMids[facei-mesh_.nInternalFaces()]
                     ),                          // point
                     f[0],                       // master point
-                    -1,                         // zone for point
                     true                        // supports a cell
                 );
 
diff --git a/src/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/polyTopoChange/polyTopoChange/polyTopoChange.C
index 621a55f328..c60fc83adc 100644
--- a/src/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -1049,7 +1049,6 @@ void Foam::polyTopoChange::compact
         pointMap_.setCapacity(newPointi);
         renumberReverseMap(localPointMap, reversePointMap_);
 
-        renumberKey(localPointMap, pointZone_);
         renumberKey(localPointMap, oldPoints_);
         renumber(localPointMap, retiredPoints_);
 
@@ -1330,67 +1329,6 @@ void Foam::polyTopoChange::resetZones
     polyMesh& newMesh
 ) const
 {
-    // pointZones
-    // ~~~~~~~~~~
-
-    {
-        const meshPointZones& pointZones = mesh.pointZones();
-
-        // Count points per zone
-
-        labelList nPoints(pointZones.size(), 0);
-
-        forAllConstIter(Map<label>, pointZone_, iter)
-        {
-            label zoneI = iter();
-
-            if (zoneI < 0 || zoneI >= pointZones.size())
-            {
-                FatalErrorInFunction
-                    << "Illegal zoneID " << zoneI << " for point "
-                    << iter.key() << " coord " << mesh.points()[iter.key()]
-                    << abort(FatalError);
-            }
-            nPoints[zoneI]++;
-        }
-
-        // Distribute points per zone
-
-        labelListList addressing(pointZones.size());
-        forAll(addressing, zoneI)
-        {
-            addressing[zoneI].setSize(nPoints[zoneI]);
-        }
-        nPoints = 0;
-
-        forAllConstIter(Map<label>, pointZone_, iter)
-        {
-            label zoneI = iter();
-
-            addressing[zoneI][nPoints[zoneI]++] = iter.key();
-        }
-        // Sort the addressing
-        forAll(addressing, zoneI)
-        {
-            stableSort(addressing[zoneI]);
-        }
-
-        // Reset the addressing on the zone
-        forAll(newMesh.pointZones(), zoneI)
-        {
-            if (debug)
-            {
-                Pout<< "pointZone:" << zoneI
-                    << "  name:" << newMesh.pointZones()[zoneI].name()
-                    << "  size:" << addressing[zoneI].size()
-                    << endl;
-            }
-
-            newMesh.pointZones()[zoneI] = addressing[zoneI];
-        }
-    }
-
-
     // faceZones
     // ~~~~~~~~~
 
@@ -1829,7 +1767,6 @@ Foam::polyTopoChange::polyTopoChange(const label nPatches, const bool strict)
     points_(0),
     pointMap_(0),
     reversePointMap_(0),
-    pointZone_(0),
     retiredPoints_(0),
     oldPoints_(0),
     faces_(0),
@@ -1859,7 +1796,6 @@ Foam::polyTopoChange::polyTopoChange
     points_(0),
     pointMap_(0),
     reversePointMap_(0),
-    pointZone_(0),
     retiredPoints_(0),
     oldPoints_(0),
     faces_(0),
@@ -1879,28 +1815,13 @@ Foam::polyTopoChange::polyTopoChange
     // Add points
     {
         const pointField& points = mesh.points();
-        const meshPointZones& pointZones = mesh.pointZones();
 
         // Extend
         points_.setCapacity(points_.size() + points.size());
         pointMap_.setCapacity(pointMap_.size() + points.size());
         reversePointMap_.setCapacity(reversePointMap_.size() + points.size());
-        pointZone_.resize(pointZone_.size() + points.size()/100);
         // No need to extend oldPoints_
 
-        // Precalc offset zones
-        labelList newZoneID(points.size(), -1);
-
-        forAll(pointZones, zoneI)
-        {
-            const labelList& pointLabels = pointZones[zoneI];
-
-            forAll(pointLabels, j)
-            {
-                newZoneID[pointLabels[j]] = zoneI;
-            }
-        }
-
         // Add points in mesh order
         for (label pointi = 0; pointi < mesh.nPoints(); pointi++)
         {
@@ -1908,7 +1829,6 @@ Foam::polyTopoChange::polyTopoChange
             (
                 points[pointi],
                 pointi,
-                newZoneID[pointi],
                 true
             );
         }
@@ -2065,7 +1985,6 @@ void Foam::polyTopoChange::clear()
     points_.clearStorage();
     pointMap_.clearStorage();
     reversePointMap_.clearStorage();
-    pointZone_.clearStorage();
     retiredPoints_.clearStorage();
     oldPoints_.clearStorage();
 
@@ -2096,7 +2015,6 @@ void Foam::polyTopoChange::setCapacity
     points_.setCapacity(nPoints);
     pointMap_.setCapacity(nPoints);
     reversePointMap_.setCapacity(nPoints);
-    pointZone_.resize(pointZone_.size() + nPoints/100);
 
     faces_.setCapacity(nFaces);
     region_.setCapacity(nFaces);
@@ -2118,7 +2036,6 @@ Foam::label Foam::polyTopoChange::addPoint
 (
     const point& pt,
     const label masterPointID,
-    const label zoneID,
     const bool inCell
 )
 {
@@ -2128,11 +2045,6 @@ Foam::label Foam::polyTopoChange::addPoint
     pointMap_.append(masterPointID);
     reversePointMap_.append(pointi);
 
-    if (zoneID >= 0)
-    {
-        pointZone_.insert(pointi, zoneID);
-    }
-
     if (!inCell)
     {
         retiredPoints_.insert(pointi);
@@ -2146,7 +2058,6 @@ void Foam::polyTopoChange::modifyPoint
 (
     const label pointi,
     const point& pt,
-    const label newZoneID,
     const bool inCell
 )
 {
@@ -2165,24 +2076,6 @@ void Foam::polyTopoChange::modifyPoint
     }
     points_[pointi] = pt;
 
-    Map<label>::iterator pointFnd = pointZone_.find(pointi);
-
-    if (pointFnd != pointZone_.end())
-    {
-        if (newZoneID >= 0)
-        {
-            pointFnd() = newZoneID;
-        }
-        else
-        {
-            pointZone_.erase(pointFnd);
-        }
-    }
-    else if (newZoneID >= 0)
-    {
-        pointZone_.insert(pointi, newZoneID);
-    }
-
     if (inCell)
     {
         retiredPoints_.erase(pointi);
@@ -2196,98 +2089,6 @@ void Foam::polyTopoChange::modifyPoint
 }
 
 
-Foam::label Foam::polyTopoChange::addPoint
-(
-    const point& pt,
-    const point& oldPt,
-    const label masterPointID,
-    const label zoneID
-)
-{
-    label pointi = points_.size();
-
-    points_.append(pt);
-    pointMap_.append(masterPointID);
-    reversePointMap_.append(pointi);
-
-    if (zoneID >= 0)
-    {
-        pointZone_.insert(pointi, zoneID);
-    }
-
-    oldPoints_.insert(pointi, oldPt);
-
-    return pointi;
-}
-
-
-void Foam::polyTopoChange::modifyPoint
-(
-    const label pointi,
-    const point& pt,
-    const point& oldPt,
-    const label newZoneID
-)
-{
-    if (pointi < 0 || pointi >= points_.size())
-    {
-        FatalErrorInFunction
-            << "illegal point label " << pointi << endl
-            << "Valid point labels are 0 .. " << points_.size()-1
-            << abort(FatalError);
-    }
-    if (pointRemoved(pointi) || pointMap_[pointi] == -1)
-    {
-        FatalErrorInFunction
-            << "point " << pointi << " already marked for removal"
-            << abort(FatalError);
-    }
-    points_[pointi] = pt;
-
-    Map<label>::iterator pointFnd = pointZone_.find(pointi);
-
-    if (pointFnd != pointZone_.end())
-    {
-        if (newZoneID >= 0)
-        {
-            pointFnd() = newZoneID;
-        }
-        else
-        {
-            pointZone_.erase(pointFnd);
-        }
-    }
-    else if (newZoneID >= 0)
-    {
-        pointZone_.insert(pointi, newZoneID);
-    }
-
-    // Always active
-    retiredPoints_.erase(pointi);
-
-    // Always provided old point
-    oldPoints_.set(pointi, oldPt);
-}
-
-
-void Foam::polyTopoChange::movePoints(const pointField& newPoints)
-{
-    if (newPoints.size() != points_.size())
-    {
-        FatalErrorInFunction
-            << "illegal pointField size." << endl
-            << "Size:" << newPoints.size() << endl
-            << "Points in mesh:" << points_.size()
-            << abort(FatalError);
-    }
-
-    forAll(points_, pointi)
-    {
-        points_[pointi] = newPoints[pointi];
-    }
-}
-
-
 void Foam::polyTopoChange::removePoint
 (
     const label pointi,
@@ -2331,7 +2132,6 @@ void Foam::polyTopoChange::removePoint
     {
         reversePointMap_[pointi] = -1;
     }
-    pointZone_.erase(pointi);
     retiredPoints_.erase(pointi);
     oldPoints_.erase(pointi);
 }
@@ -2663,7 +2463,6 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::changeMesh
 
     // Clear zone info
     {
-        pointZone_.clearStorage();
         faceZone_.clearStorage();
         faceZoneFlip_.clearStorage();
         cellZone_.clearStorage();
@@ -2890,12 +2689,13 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::makeMesh
     {
         forAll(oldPointZones, i)
         {
-            pZonePtrs[i] = new pointZone
-            (
-                oldPointZones[i].name(),
-                labelList(0),
-                newMesh.pointZones()
-            );
+            // pZonePtrs[i] = new pointZone
+            // (
+            //     oldPointZones[i].name(),
+            //     labelList(0),
+            //     newMesh.pointZones()
+            // );
+            pZonePtrs[i] = oldPointZones[i].clone(newMesh.pointZones()).ptr();
         }
     }
 
@@ -2933,7 +2733,6 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::polyTopoChange::makeMesh
 
     // Clear zone info
     {
-        pointZone_.clearStorage();
         faceZone_.clearStorage();
         faceZoneFlip_.clearStorage();
         cellZone_.clearStorage();
diff --git a/src/polyTopoChange/polyTopoChange/polyTopoChange.H b/src/polyTopoChange/polyTopoChange/polyTopoChange.H
index 22d0d9bcaa..4bee845980 100644
--- a/src/polyTopoChange/polyTopoChange/polyTopoChange.H
+++ b/src/polyTopoChange/polyTopoChange/polyTopoChange.H
@@ -122,9 +122,6 @@ class polyTopoChange
             //  (used to map return value of addPoint to new mesh point)
             DynamicList<label> reversePointMap_;
 
-            //- Zone of point
-            Map<label> pointZone_;
-
             //- Retired points
             labelHashSet retiredPoints_;
 
@@ -442,9 +439,6 @@ public:
                 const label nCells
             );
 
-            //- Move all points. Incompatible with other topology changes.
-            void movePoints(const pointField& newPoints);
-
             //- Add point. Return new point label.
             //  Notes:
             //  - masterPointID can be < 0 (appended points)
@@ -453,7 +447,6 @@ public:
             (
                 const point&,
                 const label masterPointID,
-                const label zoneID,
                 const bool inCell
             );
 
@@ -464,35 +457,9 @@ public:
             (
                 const label,
                 const point&,
-                const label newZoneID,
                 const bool inCell
             );
 
-            // Explicitly provided 'old' point location
-
-                //- Add point with original position. Return new point label.
-                //  Notes:
-                //  - masterPointID can be < 0 (appended points)
-                //  - inCell = false: add retired point (to end of point list)
-                label addPoint
-                (
-                    const point& newPosition,
-                    const point& oldPosition,
-                    const label masterPointID,
-                    const label zoneID
-                );
-
-                //- Modify coordinate.
-                //  Notes:
-                //  - inCell = false: add retired point (to end of point list)
-                void modifyPoint
-                (
-                    const label pointi,
-                    const point& newPosition,
-                    const point& oldPosition,
-                    const label newZoneID
-                );
-
             //- Remove/merge point.
             void removePoint(const label, const label);
 
diff --git a/src/polyTopoChange/polyTopoChange/removePoints.C b/src/polyTopoChange/polyTopoChange/removePoints.C
index e3e45a2cd7..3d4bd99bac 100644
--- a/src/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/polyTopoChange/polyTopoChange/removePoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -793,7 +793,6 @@ void Foam::removePoints::setUnrefinement
         (
             savedPoints_[localI],   // point
             -1,                     // master point
-            -1,                     // zone for point
             true                    // supports a cell
         );