diff --git a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
index 014c54320a1529052b78b67b2c8ef9654dd42195..b77ff57df69394e92020284290216af7897d874f 100644
--- a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
@@ -412,9 +412,6 @@ private:
         int scvfCounter = 0;
         for (const auto& intersection : intersections(fvGridGeometry().gridView(), element))
         {
-            // TODO check if intersection is on interior boundary
-            const auto isInteriorBoundary = false;
-
             if (dim < dimWorld)
                 if (handledScvf[intersection.indexInInside()])
                     continue;
@@ -427,7 +424,7 @@ private:
                                     intersection.geometry(),
                                     scvFaceIndices[scvfCounter],
                                     scvIndices,
-                                    intersection.boundary() || isInteriorBoundary);
+                                    intersection.boundary());
                 scvfIndices_.emplace_back(scvFaceIndices[scvfCounter]);
                 scvfCounter++;
 
@@ -458,14 +455,11 @@ private:
         int scvfCounter = 0;
         for (const auto& intersection : intersections(fvGridGeometry().gridView(), element))
         {
-            // TODO check if intersection is on interior boundary
-            const auto isInteriorBoundary = false;
-
             if (dim < dimWorld)
                 if (handledScvf[intersection.indexInInside()])
                     continue;
 
-            if (intersection.neighbor() && !isInteriorBoundary)
+            if (intersection.neighbor())
             {
                 // only create subcontrol faces where the outside element is the bound element
                 if (dim == dimWorld)
@@ -513,7 +507,7 @@ private:
                     handledScvf[intersection.indexInInside()] = true;
                 scvfCounter++;
             }
-            else if (intersection.boundary() || isInteriorBoundary)
+            else if (intersection.boundary())
             {
                 // for surface and network grids mark that we handled this face
                 if (dim < dimWorld)
diff --git a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
index 9d38e45f97d540192eec3a8dcf194fdddbce4ba2..520823347a851b3c135c18374cd7145aa9da41f8 100644
--- a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
@@ -172,11 +172,8 @@ public:
 
             for (const auto& intersection : intersections(this->gridView(), element))
             {
-                // TODO check if intersection is on interior boundary
-                const auto isInteriorBoundary = false;
-
                 // inner sub control volume faces
-                if (intersection.neighbor() && !isInteriorBoundary)
+                if (intersection.neighbor())
                 {
                     if (dim == dimWorld)
                     {
@@ -211,7 +208,7 @@ public:
                     }
                 }
                 // boundary sub control volume faces
-                else if (intersection.boundary() || isInteriorBoundary)
+                else if (intersection.boundary())
                 {
                     scvfs_.emplace_back(intersection,
                                         intersection.geometry(),
@@ -426,11 +423,8 @@ public:
 
             for (const auto& intersection : intersections(this->gridView(), element))
             {
-                // TODO check if intersection is on interior boundary
-                const auto isInteriorBoundary = false;
-
                 // inner sub control volume faces
-                if (intersection.neighbor() && !isInteriorBoundary)
+                if (intersection.neighbor())
                 {
                     if (dim == dimWorld)
                     {
@@ -455,7 +449,7 @@ public:
                     }
                 }
                 // boundary sub control volume faces
-                else if (intersection.boundary() || isInteriorBoundary)
+                else if (intersection.boundary())
                 {
                     scvfsIndexSet.push_back(numScvf_++);
                     neighborVolVarIndexSet.push_back({numScvs_ + numBoundaryScvf_++});