diff --git a/include/hpp/manipulation/connected-component.hh b/include/hpp/manipulation/connected-component.hh
index aacad2584983100612cd22b8307978087a6585f0..c87d6c245a0b30c86eaeeb693960380ac411c120 100644
--- a/include/hpp/manipulation/connected-component.hh
+++ b/include/hpp/manipulation/connected-component.hh
@@ -20,13 +20,9 @@
 #define HPP_MANIPULATION_CONNECTED_COMPONENT_HH
 
 #include <hpp/core/connected-component.hh>
-//#include <hpp/util/pointer.hh>
 #include <hpp/manipulation/config.hh>
 #include <hpp/manipulation/fwd.hh>
 #include <hpp/manipulation/graph/fwd.hh>
-//#include "hpp/manipulation/roadmap.hh"
-//#include <hpp/core/distance.hh>
-//#include "hpp/manipulation/roadmap-node.hh"
 
 namespace hpp {
   namespace manipulation {
@@ -45,9 +41,6 @@ class HPP_MANIPULATION_DLLAPI ConnectedComponent : public core::ConnectedCompone
       /// return a shared pointer to new instance of manipulation::ConnectedComponent 
       static ConnectedComponentPtr_t create (const RoadmapWkPtr_t& roadmap);
 
-      /// helper method to set dynamic variable "roadmap_" within static function "create"
-//      static void setRoadmap (const RoadmapWkPtr_t& roadmap, ConnectedComponentPtr_t CC);
-
       /// Merge two connected components (extension of core::ConnectedComponent::merge)
       /// \param other manipulation connected component to merge into this one.
       /// \note other will be empty after calling this method.
diff --git a/src/connected-component.cc b/src/connected-component.cc
index b4a0b9cfdea8588ec139b9187bf3a047cebaabbb..de92fb53e0d53d6bd244118be31e4cccba1f6ca6 100644
--- a/src/connected-component.cc
+++ b/src/connected-component.cc
@@ -35,11 +35,6 @@ namespace hpp {
       return shPtr;
     }
 
-//    void ConnectedComponent::setRoadmap (const RoadmapWkPtr_t& roadmap, ConnectedComponentPtr_t CC)
-//    {
-//      CC->rdmp_ = roadmap.lock ();
-//    }
- 
     void ConnectedComponent::merge (const core::ConnectedComponentPtr_t& otherCC)
     {
       core::ConnectedComponent::merge(otherCC);
diff --git a/src/roadmap.cc b/src/roadmap.cc
index 8724b75d8089204d919215e4255f3e7f9bf35c2e..7098d49011d4ef0533ae51729363f8b0e14b9aeb 100644
--- a/src/roadmap.cc
+++ b/src/roadmap.cc
@@ -19,8 +19,6 @@
 #include <hpp/util/pointer.hh>
 #include <hpp/core/distance.hh>
 #include <hpp/manipulation/connected-component.hh>
-// #include <hpp/core/connected-component.hh>
-
 
 #include <hpp/manipulation/roadmap-node.hh>