diff --git a/src/TNL/Containers/StaticVector.h b/src/TNL/Containers/StaticVector.h
index 8e36cde09f058ff310f283d5707939dc52031b7f..75f062a8049b0e7b159b84f2eee3b721a6fcec55 100644
--- a/src/TNL/Containers/StaticVector.h
+++ b/src/TNL/Containers/StaticVector.h
@@ -107,7 +107,6 @@ public:
 
 #include <TNL/Containers/StaticVector.hpp>
 #include <TNL/Containers/StaticVectorExpressions.h>
-#include <TNL/Containers/Expressions/StaticExpressionTemplates.h>
 
 // TODO: move to some other source file
 namespace TNL {
diff --git a/src/TNL/Containers/StaticVector.hpp b/src/TNL/Containers/StaticVector.hpp
index fecf68e4942e1840d562f971f98c1bcccfcfc8c1..cc5a6a44837f371971a37a08d1506f47873e752b 100644
--- a/src/TNL/Containers/StaticVector.hpp
+++ b/src/TNL/Containers/StaticVector.hpp
@@ -11,7 +11,6 @@
 #pragma once
 
 #include <TNL/Containers/StaticVector.h>
-#include <TNL/Containers/StaticVectorExpressions.h>
 #include <TNL/Containers/Algorithms/VectorAssignment.h>
 
 namespace TNL {
diff --git a/src/TNL/Functions/MeshFunction.h b/src/TNL/Functions/MeshFunction.h
index 3f5b82aed847b991c01b3566515bf3e4f66fb3df..f7d6749c9ab1bd7a8a850da97fc2b7d344f43dcd 100644
--- a/src/TNL/Functions/MeshFunction.h
+++ b/src/TNL/Functions/MeshFunction.h
@@ -12,8 +12,6 @@
 
 #include <TNL/File.h>
 #include <TNL/Functions/Domain.h>
-#include <TNL/Functions/MeshFunctionGnuplotWriter.h>
-#include <TNL/Functions/MeshFunctionVTKWriter.h>
 #include <TNL/Pointers/SharedPointer.h>
 #include <TNL/Meshes/DistributedMeshes/DistributedMesh.h>
 #include <TNL/Meshes/DistributedMeshes/DistributedMeshSynchronizer.h>
diff --git a/src/TNL/Meshes/DistributedMeshes/SubdomainOverlapsGetter.h b/src/TNL/Meshes/DistributedMeshes/SubdomainOverlapsGetter.h
index 6bdc252ec2ef894ea3632bf1c61c8cba7ba402f1..851ff66273fcc97f705aa37d5f6e1c8af3336260 100644
--- a/src/TNL/Meshes/DistributedMeshes/SubdomainOverlapsGetter.h
+++ b/src/TNL/Meshes/DistributedMeshes/SubdomainOverlapsGetter.h
@@ -11,7 +11,6 @@
 #pragma once
 
 #include <TNL/Meshes/Grid.h>
-#include <TNL/Meshes/Mesh.h>
 #include <TNL/Meshes/DistributedMeshes/DistributedMesh.h>
 
 namespace TNL {
@@ -23,29 +22,6 @@ template< typename Mesh,
 class SubdomainOverlapsGetter
 {};
 
-template< typename MeshConfig,
-          typename Device,
-          typename Communicator >
-class SubdomainOverlapsGetter< Mesh< MeshConfig, Device >, Communicator >
-{
-   public:
-      
-      using MeshType = Mesh< MeshConfig, Device >;
-      using DeviceType = Device;
-      using IndexType = typename MeshType::IndexType;
-      using DistributedMeshType = DistributedMesh< MeshType >;
-      using SubdomainOverlapsType = typename DistributedMeshType::SubdomainOverlapsType;
-      using CommunicatorType = Communicator;
-      
-      // Computes subdomain overlaps
-      // TODO: Its gonna be very likely different for Mesh than for Grid
-      static void getOverlaps( const DistributedMeshType* distributedMesh,
-                               SubdomainOverlapsType& lower,
-                               SubdomainOverlapsType& upper,
-                               IndexType subdomainOverlapSize,
-                               const SubdomainOverlapsType& periodicBoundariesOverlapSize = 0 );
-};
-
 // TODO: Specializations by the grid dimension can be avoided when the MPI directions are 
 // rewritten in a dimension independent way