diff --git a/src/TNL/Meshes/Geometry/EntityDecomposer.h b/src/TNL/Meshes/Geometry/EntityDecomposer.h
index d15662ff8d223ca229931f3694801296ad942615..268be58af1e595e68fc5c6af56a6381bc2362825 100644
--- a/src/TNL/Meshes/Geometry/EntityDecomposer.h
+++ b/src/TNL/Meshes/Geometry/EntityDecomposer.h
@@ -1,13 +1,10 @@
 #pragma once
 
-#include <TNL/Meshes/Mesh.h>
 #include <TNL/Meshes/MeshEntity.h>
-#include <TNL/Meshes/MeshBuilder.h>
 #include <TNL/Meshes/Topologies/Triangle.h>
 #include <TNL/Meshes/Topologies/Polygon.h>
+#include <TNL/Meshes/Topologies/Polyhedron.h>
 #include <TNL/Meshes/Geometry/getEntityCenter.h>
-#include <TNL/Meshes/Geometry/getEntityMeasure.h>
-#include <functional>
 
 namespace TNL {
 namespace Meshes {
@@ -19,7 +16,7 @@ enum class EntityDecomposerVersion
 
 template< typename MeshConfig,
           typename Topology,
-          EntityDecomposerVersion EntityDecomposerVersion_ = EntityDecomposerVersion::ConnectEdgesToCentroid, 
+          EntityDecomposerVersion EntityDecomposerVersion_ = EntityDecomposerVersion::ConnectEdgesToCentroid,
           EntityDecomposerVersion SubentityDecomposerVersion = EntityDecomposerVersion::ConnectEdgesToCentroid >
 struct EntityDecomposer;
 
@@ -31,10 +28,9 @@ struct EntityDecomposer< MeshConfig, Topologies::Polygon, EntityDecomposerVersio
    using Topology = Topologies::Polygon;
    using MeshEntityType = MeshEntity< MeshConfig, Device, Topology >;
    using VertexMeshEntityType = typename MeshEntityType::template SubentityTraits< 0 >::SubentityType;
-   using PointType = typename VertexMeshEntityType::PointType;
    using GlobalIndexType = typename MeshConfig::GlobalIndexType;
    using LocalIndexType = typename MeshConfig::LocalIndexType;
-   
+
    static std::pair< GlobalIndexType, GlobalIndexType > getExtraPointsAndEntitiesCount( const MeshEntityType& entity )
    {
       const auto pointsCount = entity.template getSubentitiesCount< 0 >();
@@ -80,7 +76,6 @@ struct EntityDecomposer< MeshConfig, Topologies::Polygon, EntityDecomposerVersio
    using Topology = Topologies::Polygon;
    using MeshEntityType = MeshEntity< MeshConfig, Device, Topology >;
    using VertexMeshEntityType = typename MeshEntityType::template SubentityTraits< 0 >::SubentityType;
-   using PointType = typename VertexMeshEntityType::PointType;
    using GlobalIndexType = typename MeshConfig::GlobalIndexType;
    using LocalIndexType = typename MeshConfig::LocalIndexType;
 
@@ -116,11 +111,10 @@ struct EntityDecomposer< MeshConfig, Topologies::Polyhedron, EntityDecomposerVer
    using FaceTopology = Topologies::Polygon;
    using MeshEntityType = MeshEntity< MeshConfig, Device, CellTopology >;
    using VertexMeshEntityType = typename MeshEntityType::template SubentityTraits< 0 >::SubentityType;
-   using PointType = typename VertexMeshEntityType::PointType;
    using GlobalIndexType = typename MeshConfig::GlobalIndexType;
    using LocalIndexType = typename MeshConfig::LocalIndexType;
    using SubentityDecomposer = EntityDecomposer< MeshConfig, FaceTopology, SubentityDecomposerVersion >;
-   
+
    static std::pair< GlobalIndexType, GlobalIndexType > getExtraPointsAndEntitiesCount( const MeshEntityType& entity )
    {
       const auto& mesh = entity.getMesh();
@@ -170,12 +164,10 @@ struct EntityDecomposer< MeshConfig, Topologies::Polyhedron, EntityDecomposerVer
    using MeshEntityType = MeshEntity< MeshConfig, Device, CellTopology >;
    using MeshSubentityType = MeshEntity< MeshConfig, Device, FaceTopology >;
    using VertexMeshEntityType = typename MeshEntityType::template SubentityTraits< 0 >::SubentityType;
-   using PointType = typename VertexMeshEntityType::PointType;
    using GlobalIndexType = typename MeshConfig::GlobalIndexType;
    using LocalIndexType = typename MeshConfig::LocalIndexType;
-   using RealType = typename MeshConfig::RealType;
    using SubentityDecomposer = EntityDecomposer< MeshConfig, FaceTopology, SubentityDecomposerVersion >;
-   
+
    static std::pair< GlobalIndexType, GlobalIndexType > getExtraPointsAndEntitiesCount( const MeshEntityType& entity )
    {
       const auto& mesh = entity.getMesh();
@@ -232,4 +224,4 @@ private:
 };
 
 } // namespace Meshes
-} // namespace TNL
\ No newline at end of file
+} // namespace TNL
diff --git a/src/TNL/Meshes/Geometry/getDecomposedMesh.h b/src/TNL/Meshes/Geometry/getDecomposedMesh.h
index d5a370960bbd1d821eebe2c872a01eb6fac0f1aa..d99d9ba8b153043a5e9f991702b2e8bdf83a361b 100644
--- a/src/TNL/Meshes/Geometry/getDecomposedMesh.h
+++ b/src/TNL/Meshes/Geometry/getDecomposedMesh.h
@@ -36,7 +36,6 @@ decomposeMesh( const Mesh< MeshConfig, Devices::Host >& inMesh )
    using TriangleMesh = Mesh< TriangleMeshConfig, Devices::Host >;
    using MeshBuilder = MeshBuilder< TriangleMesh >;
    using GlobalIndexType = typename TriangleMesh::GlobalIndexType;
-   using LocalIndexType = typename TriangleMesh::LocalIndexType;
    using PointType = typename TriangleMesh::PointType;
    using EntityDecomposer = EntityDecomposer< MeshConfig, Topologies::Polygon, DecomposerVersion >;
    constexpr int CellDimension = TriangleMesh::getMeshDimension();
@@ -138,7 +137,6 @@ decomposeMesh( const Mesh< MeshConfig, Devices::Host >& inMesh )
    using TetrahedronMesh = Mesh< TetrahedronMeshConfig, Devices::Host >;
    using MeshBuilder = MeshBuilder< TetrahedronMesh >;
    using GlobalIndexType = typename TetrahedronMesh::GlobalIndexType;
-   using LocalIndexType = typename TetrahedronMesh::LocalIndexType;
    using PointType = typename TetrahedronMesh::PointType;
    using EntityDecomposer = EntityDecomposer< MeshConfig, Topologies::Polyhedron, DecomposerVersion, SubdecomposerVersion >;
    constexpr int CellDimension = TetrahedronMesh::getMeshDimension();
diff --git a/src/TNL/Meshes/Geometry/getPlanarMesh.h b/src/TNL/Meshes/Geometry/getPlanarMesh.h
index c26ebe66fa6bfbb8f6aa48407a238bf4cf640fa5..f32e5da9717cec565ae550e5b4f07debe919eeab 100644
--- a/src/TNL/Meshes/Geometry/getPlanarMesh.h
+++ b/src/TNL/Meshes/Geometry/getPlanarMesh.h
@@ -34,7 +34,6 @@ planarCorrection( const Mesh< MeshConfig, Devices::Host >& inMesh )
    using LocalIndexType = typename PolygonMesh::LocalIndexType;
    using PointType = typename PolygonMesh::PointType;
    using RealType = typename PolygonMesh::RealType;
-   using BoolVector = Containers::Vector< bool, Devices::Host, GlobalIndexType >;
    using EntityDecomposer = EntityDecomposer< MeshConfig, Topologies::Polygon, DecomposerVersion >;
    constexpr int CellDimension = PolygonMesh::getMeshDimension();