diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2b9dcc..46c2b1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,19 +3,11 @@ project(Shell VERSION 1.0 LANGUAGES CXX)
 
 # Find and load CMake configuration of packages containing this plugin's dependencies
 find_package(Sofa.Config REQUIRED)
-sofa_find_package(Sofa.GL REQUIRED)
-sofa_find_package(Sofa.Type REQUIRED)
-sofa_find_package(Sofa.Geometry REQUIRED)
-sofa_find_package(Sofa.Simulation.Core REQUIRED)
 sofa_find_package(Sofa.Component.Controller REQUIRED)
-sofa_find_package(Sofa.Component.StateContainer REQUIRED)
-sofa_find_package(Sofa.Component.Mapping.NonLinear REQUIRED)
-sofa_find_package(Sofa.Component.Constraint REQUIRED)
-sofa_find_package(Sofa.Component.Constraint.Lagrangian REQUIRED)
-sofa_find_package(Sofa.Component.Constraint.Lagrangian.Model REQUIRED)
-sofa_find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED)
 sofa_find_package(Sofa.Component.Topology.Container.Dynamic REQUIRED)
-sofa_find_package(Sofa.Component.Collision.Detection.Intersection REQUIRED)
+sofa_find_package(Sofa.Component.StateContainer REQUIRED)
+sofa_find_package(Sofa.Component.Mapping.Linear REQUIRED)
+sofa_find_package(Sofa.GL REQUIRED)
 
 set(README_FILE README.md)
 
@@ -120,20 +112,8 @@ target_link_libraries(${PROJECT_NAME}
     Sofa.Component.Controller
     Sofa.Component.Topology.Container.Dynamic
     Sofa.Component.StateContainer
-    Sofa.GL
-    Sofa.Component.Collision.Detection.Intersection
-    Sofa.Component.Mapping.NonLinear
-    Sofa.Component.Constraint.Lagrangian.Model
-    Sofa.Component.Constraint.Lagrangian.Solver
-    Sofa.Component.Constraint.Lagrangian
-    Sofa.Component.Constraint.Projective
-    Sofa.Component.Mass
-    Sofa.Component.SolidMechanics.Spring
-    Sofa.Component.MechanicalLoad
-    Sofa.Component.LinearSolver.Iterative
-    Sofa.Component.ODESolver.Backward
-    Sofa.Component.Engine.Select
     Sofa.Component.Mapping.Linear
+    Sofa.GL
 )
 
 sofa_create_package_with_targets(
diff --git a/src/Shell/mapping/BendingPlateMechanicalMapping.inl b/src/Shell/mapping/BendingPlateMechanicalMapping.inl
index 211af25..c41f4aa 100644
--- a/src/Shell/mapping/BendingPlateMechanicalMapping.inl
+++ b/src/Shell/mapping/BendingPlateMechanicalMapping.inl
@@ -25,19 +25,18 @@
 #pragma once
 #include <Shell/mapping/BendingPlateMechanicalMapping.h>
 #include <sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h>
-#include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
+// #include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
 #include <sofa/core/visual/VisualParams.h>
 
-#include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
-#include <sofa/component/collision/detection/intersection/MeshMinProximityIntersection.h>
+// #include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
+// #include <sofa/component/collision/detection/intersection/MeshMinProximityIntersection.h>
 
-#include <sofa/component/mechanicalload/ConstantForceField.h>
 
 namespace sofa::component::mapping
 {
 
-using namespace sofa::component::collision;
-
+// using namespace sofa::component::collision;
+//
 
 template <class TIn, class TOut>
 void BendingPlateMechanicalMapping<TIn, TOut>::init()
diff --git a/src/Shell/mapping/BezierTriangleMechanicalMapping.inl b/src/Shell/mapping/BezierTriangleMechanicalMapping.inl
index ed3105f..80849e2 100644
--- a/src/Shell/mapping/BezierTriangleMechanicalMapping.inl
+++ b/src/Shell/mapping/BezierTriangleMechanicalMapping.inl
@@ -27,12 +27,8 @@
 
 #include <Shell/mapping/BezierTriangleMechanicalMapping.h>
 #include <sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h>
-#include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
 #include <sofa/core/visual/VisualParams.h>
 
-#include <sofa/component/mechanicalload/ConstantForceField.h>
-
-
 namespace sofa
 {
 
@@ -42,7 +38,6 @@ namespace component
 namespace mapping
 {
 
-using namespace sofa::component::collision;
 using namespace sofa::helper;
 
 // Returns the skew-symetric matrix for computing a cross-product with the 
diff --git a/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl b/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl
index 6f37433..b5d8af9 100644
--- a/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl
+++ b/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl
@@ -30,11 +30,8 @@
 #include <Shell/misc/PointProjection.h>
 
 #include <sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h>
-#include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
 #include <sofa/core/ConstraintParams.h>
 
-#include <sofa/component/mechanicalload/ConstantForceField.h>
-
 // We have own code to check the getJ() because checkJacobian sucks (at this
 // point in time).
 //#define CHECK_J
@@ -48,7 +45,6 @@ namespace component
 namespace mapping
 {
 
-using namespace sofa::component::collision;
 using namespace sofa::helper;