diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_2.h
index 23edcc32a54..0832e89aa30 100644
--- a/Packages/Triangulation_2/include/CGAL/Triangulation_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Triangulation_2.h
@@ -48,17 +48,6 @@
 
 CGAL_BEGIN_NAMESPACE
 
-
-// template < class Gt, class Tds>
-// class Triangulation_all_faces_iterator_2;
-
-// template < class Gt, class Tds>
-// class Triangulation_all_vertices__iterator_2;
-
-// template < class Gt, class Tds>
-// class Triangulation_all_edges_iterator_2;
-
-
 template < class Gt, class Tds >
 class Triangulation_2
   : public Triangulation_cw_ccw_2
@@ -287,15 +276,12 @@ public:
   All_edges_iterator all_edges_begin() const;
   All_edges_iterator all_edges_end() const; 
 
-  Face_circulator incident_faces( const Vertex_handle& v) const;
-  Face_circulator incident_faces( const Vertex_handle& v, 
-				  const Face_handle& f) const;
-  Vertex_circulator incident_vertices(const Vertex_handle& v) const;
-  Vertex_circulator incident_vertices(const Vertex_handle& v,
-				      const Face_handle& f) const;
-  Edge_circulator incident_edges(const Vertex_handle& v) const;
-  Edge_circulator incident_edges(const Vertex_handle& v,
-				 const Face_handle& f) const;
+  Face_circulator incident_faces( Vertex_handle v, 
+				  Face_handle f = Face_handle()) const;
+  Vertex_circulator incident_vertices(Vertex_handle v,
+				      Face_handle f = Face_handle()) const;
+  Edge_circulator incident_edges(Vertex_handle v,
+				 Face_handle f = Face_handle()) const;
  
   Line_face_circulator    line_walk(const Point& p,
 				    const Point& q,
@@ -1470,62 +1456,31 @@ template <class Gt, class Tds >
 inline
 Triangulation_2<Gt, Tds>::Face_circulator
 Triangulation_2<Gt, Tds>::
-incident_faces( const Vertex_handle& v) const
+incident_faces(Vertex_handle v, Face_handle f) const
 {
-  return v->incident_faces();
-}
-
-template <class Gt, class Tds >
-inline
-Triangulation_2<Gt, Tds>::Face_circulator
-Triangulation_2<Gt, Tds>::
-incident_faces( const Vertex_handle& v, const Face_handle& f) const
-{
-  return v->incident_faces(f);
+  return Face_circulator(v,f);
 }  
 
-template <class Gt, class Tds >
-inline
-Triangulation_2<Gt, Tds>::Vertex_circulator
-Triangulation_2<Gt, Tds>::
-incident_vertices(const Vertex_handle& v) const
-{
-  return v->incident_vertices();
-}
-
 template <class Gt, class Tds >
 inline
 Triangulation_2<Gt, Tds>::Vertex_circulator
 Triangulation_2<Gt, Tds>::  
-incident_vertices(const Vertex_handle& v,
-		  const Face_handle& f) const
+incident_vertices(Vertex_handle v,
+		  Face_handle f) const
 {
-  return v->incident_vertices(f);
-}
-
-template <class Gt, class Tds >
-inline
-Triangulation_2<Gt, Tds>::Edge_circulator
-Triangulation_2<Gt, Tds>::  
-incident_edges(const Vertex_handle& v) const
-{
-  return v->incident_edges();
+  return Vertex_circulator(v,f);
 }
 
 template <class Gt, class Tds >
 inline
 Triangulation_2<Gt, Tds>::Edge_circulator
 Triangulation_2<Gt, Tds>::    
-incident_edges(const Vertex_handle& v,
-	       const Face_handle& f) const
+incident_edges(Vertex_handle v,
+	       Face_handle f) const
 {
-  return v->incident_edges(f);
+  return Edge_circulator(v,f);
 }
 
-
-
-
-
 template <class Gt, class Tds >
 Triangulation_2<Gt, Tds>::Line_face_circulator  
 Triangulation_2<Gt, Tds>::    
diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_circulators_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_circulators_2.h
index 44717098057..e151d6198b7 100644
--- a/Packages/Triangulation_2/include/CGAL/Triangulation_circulators_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Triangulation_circulators_2.h
@@ -133,17 +133,6 @@ public:
     else _bvc=Base_vertex_circulator(&(*v), &(*f));
    }
 
-//   Triangulation_vertex_circulator_2(const Vertex_circulator &vc)
-//     : _bvc(vc._bvc)
-//    {}
-
-//   Triangulation_vertex_circulator_2 &
-//       operator=(const Vertex_circulator &vc)
-//   {
-//     _bvc = vc._bvc;
-//     return *this;
-//   }
-
   Vertex_circulator& operator++()  { ++_bvc; return *this; }
   Vertex_circulator& operator--()  { --_bvc; return *this; }      
   Vertex_circulator operator++(int);
@@ -194,16 +183,6 @@ public:
       else _bec=Base_edge_circulator(&(*v), &(*f));
     }
   
-//    Triangulation_edge_circulator_2(const Edge_circulator &ec)
-//     : _bec(ec._bec)
-//     {}
-   
-//   Triangulation_edge_circulator_2 &operator=(const Edge_circulator &ec)
-//   {
-//     _bec = ec._bec;
-//     return *this;
-//   }
-
   Edge_circulator& operator++()  { ++_bec; return *this;  }
   Edge_circulator& operator--()  { --_bec; return *this;  }      
   Edge_circulator operator++(int);
diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h
index 5bbb48f686f..694ff48884d 100644
--- a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h
@@ -55,11 +55,6 @@ public:
   
   Triangulation_ds_face_circulator_2(const Vertex* v, const Face* f=NULL);
         
-//   Triangulation_ds_face_circulator_2(const Face_circulator &fc)
-//     : _v(fc._v), pos(fc.pos)
-//   {}
-        
-   
   Face_circulator& operator++();
   Face_circulator operator++(int);
   Face_circulator& operator--();
@@ -97,12 +92,6 @@ public:
                 
   Triangulation_ds_vertex_circulator_2(const Vertex* v,const Face* f = NULL);
        
-//   Triangulation_ds_vertex_circulator_2(const Vertex_circulator &vc)
-//     :  _v(vc._v), pos(vc.pos), _ri(vc._ri)
-//   {}
-              
-  //  Vertex_circulator &operator=(const Vertex_circulator &vc);
- 
   Vertex_circulator& operator++();
   Vertex_circulator  operator++(int);
   Vertex_circulator& operator--();
@@ -142,12 +131,6 @@ public:
             
    Triangulation_ds_edge_circulator_2( const Vertex* v, const Face* f=NULL);
 
- //   Triangulation_ds_edge_circulator_2(const Edge_circulator &vc)
-//     : _ri(vc._ri), _v(vc._v), pos(vc.pos)
-//   {}
-        
-  //  Edge_circulator &operator=(const Edge_circulator &vc);
- 
   Edge operator*() const ;
   Edge_circulator& operator++();
   Edge_circulator operator++(int);
@@ -295,18 +278,6 @@ Triangulation_ds_vertex_circulator_2 (const Vertex* v,  const Face* f)
   return;
 }
 
-// template < class Vertex, class Face >
-// inline 
-// Triangulation_ds_vertex_circulator_2<Vertex,Face>&
-// Triangulation_ds_vertex_circulator_2<Vertex,Face> ::
-// operator=(const Vertex_circulator &vc)
-// {
-//   _v = vc._v;
-//   _ri = vc._ri;
-//   pos = vc.pos;
-//   return *this;
-// }   
-
 
 template < class Vertex, class Face >
 Triangulation_ds_vertex_circulator_2<Vertex,Face>&
@@ -445,17 +416,6 @@ Triangulation_ds_edge_circulator_2(const Vertex* v, const Face* f)
   return;
 }
 
-// template < class Vertex, class Face >
-// inline
-// Triangulation_ds_edge_circulator_2<Vertex,Face>&
-// Triangulation_ds_edge_circulator_2<Vertex,Face> ::
-// operator=(const Edge_circulator &vc)
-// {
-//   _v = vc._v;
-//   _ri = vc._ri;
-//   pos = vc.pos;
-//   return *this;
-// }
 
 template < class Vertex, class Face >
 inline std::pair<Face*, int> 
diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_vertex_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_vertex_2.h
index 476231ef5c5..e57aa72be54 100644
--- a/Packages/Triangulation_2/include/CGAL/Triangulation_vertex_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Triangulation_vertex_2.h
@@ -94,11 +94,11 @@ public:
   // degree(), point(), is_on_boundary, set_point(p)
 
   Vertex_circulator incident_vertices() const;
-  Vertex_circulator incident_vertices(const Face_handle& f) const;
+  Vertex_circulator incident_vertices(Face_handle f) const;
   Face_circulator incident_faces() const;
-  Face_circulator incident_faces(const Face_handle& f) const;
+  Face_circulator incident_faces(Face_handle f) const;
   Edge_circulator incident_edges() const;
-  Edge_circulator incident_edges(const Face_handle& f) const;
+  Edge_circulator incident_edges(Face_handle f) const;
    
 };
 
@@ -141,7 +141,7 @@ template<class Gt, class Tds>
 inline   
 Triangulation_vertex_circulator_2<Gt,Tds>
 Triangulation_vertex_2<Gt,Tds>::
-incident_vertices(const Face_handle& f) const
+incident_vertices(Face_handle f) const
 {
   return Vertex_circulator(handle(), f);
 } 
@@ -159,7 +159,7 @@ template<class Gt, class Tds>
 inline   
 Triangulation_face_circulator_2<Gt,Tds>
 Triangulation_vertex_2<Gt,Tds>::
-incident_faces(const Face_handle& f) const
+incident_faces(Face_handle f) const
 {
   return Face_circulator(handle(), f);
 }
@@ -177,7 +177,7 @@ template<class Gt, class Tds>
 inline   
 Triangulation_edge_circulator_2<Gt,Tds>
 Triangulation_vertex_2<Gt,Tds>:: 
-incident_edges(const Face_handle& f) const
+incident_edges(Face_handle f) const
 {
   return Edge_circulator(handle(), f);
 }