diff --git a/Geo/GenericEdge.cpp b/Geo/GenericEdge.cpp
index c636eb83a35a7992590b8af754ec048feda11a5c..e191af49bb50b2bd9c07662ee99ccb36c006ca2c 100644
--- a/Geo/GenericEdge.cpp
+++ b/Geo/GenericEdge.cpp
@@ -11,7 +11,6 @@
 #include "GenericFace.h"
 #include "Context.h"
 
-//------------------------------------------------------------------------
 
 GenericEdge::ptrfunction_int_double_refvector GenericEdge::EdgeEvalXYZFromT = NULL;
 GenericEdge::ptrfunction_int_refdouble_refdouble GenericEdge::EdgeEvalParBounds = NULL;
@@ -23,7 +22,6 @@ GenericEdge::ptrfunction_int_refvector_refdouble_refvector_refbool GenericEdge::
 GenericEdge::ptrfunction_int_refbool GenericEdge::EdgeIs3D = NULL;
 GenericEdge::ptrfunction_int_int_double_int_refvector GenericEdge::EdgeReparamOnFace = NULL;
 
-//------------------------------------------------------------------------
 
 GenericEdge::GenericEdge(GModel *m, int num, int _native_id, GVertex *v1, GVertex *v2, bool _isseam):GEdge(m, num, v1, v2), id(_native_id),is_seam(_isseam){
   if ((!EdgeEvalParBounds)||(!EdgeEvalXYZFromT)) Msg::Error("GenericEdge::ERROR: Callback not set");
@@ -31,18 +29,15 @@ GenericEdge::GenericEdge(GModel *m, int num, int _native_id, GVertex *v1, GVerte
   if (!ok) Msg::Error("GenericEdge::ERROR from EdgeEvalParBounds ! " );
 }
 
-//------------------------------------------------------------------------
 
 GenericEdge::~GenericEdge(){
 }
 
-//------------------------------------------------------------------------
 
 Range<double> GenericEdge::parBounds(int i) const{
   return Range<double>(s0, s1);
 }
 
-//------------------------------------------------------------------------
 
 SPoint2 GenericEdge::reparamOnFace(const GFace *face, double par, int dir) const{
   vector<double> res(2,0.);
@@ -55,7 +50,6 @@ SPoint2 GenericEdge::reparamOnFace(const GFace *face, double par, int dir) const
   return SPoint2(res[0],res[1]);;
 }
 
-//------------------------------------------------------------------------
 
 GPoint GenericEdge::closestPoint(const SPoint3 &qp, double &param) const{
   vector<double> queryPoint(3,0.);
@@ -69,14 +63,12 @@ GPoint GenericEdge::closestPoint(const SPoint3 &qp, double &param) const{
   return GPoint(res[0], res[1], res[2], this, param);
 }
 
-//------------------------------------------------------------------------
 
 bool GenericEdge::isSeam(const GFace *face) const{
 //  return false;
   return is_seam;
 }
 
-//------------------------------------------------------------------------
 
 GPoint GenericEdge::point(double par) const{
   vector<double> res(3,0.);
@@ -86,7 +78,6 @@ GPoint GenericEdge::point(double par) const{
   return GPoint(res[0], res[1], res[2], this, par);
 }
 
-//------------------------------------------------------------------------
 
 SVector3 GenericEdge::firstDer(double par) const{
   vector<double> res(3,0.);
@@ -96,7 +87,6 @@ SVector3 GenericEdge::firstDer(double par) const{
   return SVector3(res[0],res[1],res[2]);
 }
 
-//------------------------------------------------------------------------
 
 GEntity::GeomType GenericEdge::geomType() const{
   string s;
@@ -131,7 +121,6 @@ GEntity::GeomType GenericEdge::geomType() const{
   return Unknown;
 }
 
-//------------------------------------------------------------------------
 
 double GenericEdge::curvature(double par) const{
   double res;
@@ -141,7 +130,6 @@ double GenericEdge::curvature(double par) const{
   return res;
 }
 
-//------------------------------------------------------------------------
 
 bool GenericEdge::is3D() const{
   bool res;
@@ -151,7 +139,6 @@ bool GenericEdge::is3D() const{
   return res;
 }
 
-//------------------------------------------------------------------------
 
 bool GenericEdge::degenerate(int) const{
   bool res=false;
@@ -161,7 +148,6 @@ bool GenericEdge::degenerate(int) const{
   return res;
 }
 
-//------------------------------------------------------------------------
 
 int GenericEdge::minimumDrawSegments() const
 {
@@ -171,17 +157,11 @@ int GenericEdge::minimumDrawSegments() const
     return CTX::instance()->geom.numSubEdges * GEdge::minimumDrawSegments();
 }
 
-//------------------------------------------------------------------------
 
 
 
 
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
 
 LinearSeamEdge::LinearSeamEdge(GModel *m, int num, GVertex *v1, GVertex *v2):GEdge(m, num, v1, v2){
   s0=0.;
@@ -190,60 +170,50 @@ LinearSeamEdge::LinearSeamEdge(GModel *m, int num, GVertex *v1, GVertex *v2):GEd
   first_der.normalize();
 }
 
-//------------------------------------------------------------------------
 
 LinearSeamEdge::~LinearSeamEdge(){
 }
 
-//------------------------------------------------------------------------
 
 Range<double> LinearSeamEdge::parBounds(int i) const{
   return Range<double>(s0, s1);
 }
 
-//------------------------------------------------------------------------
 
 GPoint LinearSeamEdge::point(double par) const{
   SVector3 res = v0->xyz() + par*first_der;
   return GPoint(res[0], res[1], res[2], this, par);
 }
 
-//------------------------------------------------------------------------
 
 SVector3 LinearSeamEdge::firstDer(double par) const{
   return first_der;
 }
 
-//------------------------------------------------------------------------
 
 GEntity::GeomType LinearSeamEdge::geomType() const{
   return Line;
 }
 
-//------------------------------------------------------------------------
 
 double LinearSeamEdge::curvature(double par) const{
   return 0.;
 }
 
-//------------------------------------------------------------------------
 
 bool LinearSeamEdge::is3D() const{
   return false;
 }
 
-//------------------------------------------------------------------------
 
 bool LinearSeamEdge::degenerate(int) const{
   return false;
 }
 
-//------------------------------------------------------------------------
 
 GPoint LinearSeamEdge::closestPoint(const SPoint3 &q, double &t) const
 {
   return GEdge::closestPoint(q,t);
 }
 
-//------------------------------------------------------------------------
 
diff --git a/Geo/GenericFace.cpp b/Geo/GenericFace.cpp
index 7baaf1211940d6c3775f10651fdf88cf08bc7854..59df180c893d35e51ed0dc9726e259ec48ef504a 100644
--- a/Geo/GenericFace.cpp
+++ b/Geo/GenericFace.cpp
@@ -15,7 +15,6 @@
 #include <math.h>
 
 
-//------------------------------------------------------------------------
 
 GenericFace::ptrfunction_int_refstring GenericFace::FaceGeomType = NULL;
 GenericFace::ptrfunction_int_refvector_refvector GenericFace::FaceUVFromXYZ = NULL;
@@ -30,7 +29,6 @@ GenericFace::ptrfunction_int_refvector_refvector_refvector GenericFace::FaceFirs
 GenericFace::ptrfunction_int_refvector_refvector_refvector_refvector GenericFace::FaceSecondDer = NULL;
 GenericFace::ptrfunction_int_refbool_refbool_refdouble_refdouble GenericFace::FacePeriodicInfo = NULL;
 
-//------------------------------------------------------------------------
 
 GenericFace::GenericFace(GModel *m, int num, int _native_id):GFace(m, num), id(_native_id){
   if (!FaceParBounds) Msg::Fatal("Genericface::ERROR: Callback FaceParBounds not set");
@@ -42,19 +40,16 @@ GenericFace::GenericFace(GModel *m, int num, int _native_id):GFace(m, num), id(_
   computePeriodicity();
 }
 
-//------------------------------------------------------------------------
 
 GenericFace::~GenericFace(){
 }
 
-//------------------------------------------------------------------------
 
 Range<double> GenericFace::parBounds(int i) const{
   if(i == 0) return Range<double>(umin, umax);
   return Range<double>(vmin, vmax);
 }
 
-//------------------------------------------------------------------------
 
 SVector3 GenericFace::normal(const SPoint2 &param) const{
   vector<double> res(3,0.);
@@ -66,7 +61,6 @@ SVector3 GenericFace::normal(const SPoint2 &param) const{
   return SVector3(res[0],res[1],res[2]);
 }
 
-//------------------------------------------------------------------------
 
 Pair<SVector3,SVector3> GenericFace::firstDer(const SPoint2 &param) const{
   if (!FaceFirstDer) Msg::Fatal("Genericface::ERROR: Callback FaceFirstDer not set");
@@ -80,7 +74,6 @@ Pair<SVector3,SVector3> GenericFace::firstDer(const SPoint2 &param) const{
                                  SVector3(derv[0],derv[1],derv[2]));
 }
 
-//------------------------------------------------------------------------
 
 void GenericFace::secondDer(const SPoint2 &param,SVector3 *dudu, SVector3 *dvdv, SVector3 *dudv) const{
   vector<double> deruu(3,0.);
@@ -97,7 +90,6 @@ void GenericFace::secondDer(const SPoint2 &param,SVector3 *dudu, SVector3 *dvdv,
   return;
 }
 
-//------------------------------------------------------------------------
 
 GPoint GenericFace::point(double par1, double par2) const{
   vector<double> uv(2,0.);
@@ -116,7 +108,6 @@ GPoint GenericFace::point(double par1, double par2) const{
   return GPoint(xyz[0], xyz[1], xyz[2], this, pp);
 }
 
-//------------------------------------------------------------------------
 
 GPoint GenericFace::closestPoint(const SPoint3 &qp, const double initialGuess[2]) const{
   vector<double> uvres(2,0.);
@@ -142,7 +133,6 @@ GPoint GenericFace::closestPoint(const SPoint3 &qp, const double initialGuess[2]
   return GPoint(xyzres[0], xyzres[1], xyzres[2], this, pp);
 }
 
-//------------------------------------------------------------------------
 
 SPoint2 GenericFace::parFromPoint(const SPoint3 &qp, bool onSurface) const{
   vector<double> uvres(2,0.);
@@ -168,7 +158,6 @@ SPoint2 GenericFace::parFromPoint(const SPoint3 &qp, bool onSurface) const{
   return SPoint2(uvres[0],uvres[1]);
 }
 
-//------------------------------------------------------------------------
 
 GEntity::GeomType GenericFace::geomType() const{
   string s;
@@ -199,7 +188,6 @@ GEntity::GeomType GenericFace::geomType() const{
   return Unknown;
 }
 
-//------------------------------------------------------------------------
 
 double GenericFace::curvatureMax(const SPoint2 &param) const{
   vector<double> dirMax(3,0.);
@@ -213,7 +201,6 @@ double GenericFace::curvatureMax(const SPoint2 &param) const{
   return std::max(fabs(curvMax), fabs(curvMin));
 }
 
-//------------------------------------------------------------------------
 
 double GenericFace::curvatures(const SPoint2 &_param,SVector3 *_dirMax,SVector3 *_dirMin,double *curvMax,double *curvMin) const{
   vector<double> param(2,0.);
@@ -230,7 +217,6 @@ double GenericFace::curvatures(const SPoint2 &_param,SVector3 *_dirMax,SVector3
   return *curvMax;
 }
 
-//------------------------------------------------------------------------
 
 bool GenericFace::containsPoint(const SPoint3 &pt) const{
   bool res;
@@ -242,7 +228,6 @@ bool GenericFace::containsPoint(const SPoint3 &pt) const{
   return res;
 }
 
-//------------------------------------------------------------------------
 
 void GenericFace::computePeriodicity(){
   if (!FacePeriodicInfo) Msg::Fatal("Genericface::ERROR: Callback FacePeriodicInfo not set");
@@ -252,7 +237,6 @@ void GenericFace::computePeriodicity(){
 
 }
 
-//------------------------------------------------------------------------
 
 void GenericFace::createLoops(){
   const bool debug = false;
@@ -299,5 +283,4 @@ void GenericFace::createLoops(){
   }
 }
 
-//------------------------------------------------------------------------
 
diff --git a/Geo/GenericRegion.cpp b/Geo/GenericRegion.cpp
index a6b8f1a408777c553d70eddad8ebeb541a48d391..4031c11d9bd4affec9c9143075fad4c29c6b7585 100644
--- a/Geo/GenericRegion.cpp
+++ b/Geo/GenericRegion.cpp
@@ -11,24 +11,20 @@
 #include "GenericFace.h"
 #include "GenericRegion.h"
 
-//------------------------------------------------------------------------
 
 GenericRegion::GenericRegion(GModel *m, int num, int _native_id):GRegion(m, num), id(_native_id)
 {
 }
 
-//------------------------------------------------------------------------
 
 GenericRegion::~GenericRegion()
 {
 }
 
-//------------------------------------------------------------------------
 
 GEntity::GeomType GenericRegion::geomType() const
 {
   return Unknown;
 }
 
-//------------------------------------------------------------------------
 
diff --git a/Geo/GenericVertex.cpp b/Geo/GenericVertex.cpp
index 819f26a98a8a4ae096aa48badf9fe4201b658866..49500ce09a5479b46df9f3576c880bdd6d3ee019 100644
--- a/Geo/GenericVertex.cpp
+++ b/Geo/GenericVertex.cpp
@@ -12,12 +12,10 @@
 #include "GenericFace.h"
 #include<algorithm>
 
-//------------------------------------------------------------------------
 
 GenericVertex::ptrfunction_int_vector GenericVertex::VertexXYZ = NULL;
 GenericVertex::ptrfunction_int_doubleptr_voidptr GenericVertex::VertexMeshSize = NULL;
 
-//------------------------------------------------------------------------
 
 GenericVertex::GenericVertex(GModel *m, int num, int _native_id):GVertex(m, num), id(_native_id){
   if (!VertexXYZ)
@@ -31,7 +29,6 @@ GenericVertex::GenericVertex(GModel *m, int num, int _native_id):GVertex(m, num)
   _z=vec[2];
 }
 
-//------------------------------------------------------------------------
 
 GenericVertex::GenericVertex(GModel *m, int num, int _native_id, const vector<double> &vec):GVertex(m, num), id(_native_id){
   if (!VertexXYZ)
@@ -42,12 +39,10 @@ GenericVertex::GenericVertex(GModel *m, int num, int _native_id, const vector<do
   _z=vec[2];
 }
 
-//------------------------------------------------------------------------
 
 GenericVertex::~GenericVertex(){
 }
 
-//------------------------------------------------------------------------
 
 SPoint2 GenericVertex::reparamOnFace(const GFace *gf, int dir) const
 {
@@ -57,7 +52,6 @@ SPoint2 GenericVertex::reparamOnFace(const GFace *gf, int dir) const
 
 }
 
-//------------------------------------------------------------------------
 
 void GenericVertex::setPosition(GPoint &p)
 {
@@ -71,4 +65,3 @@ void GenericVertex::setPosition(GPoint &p)
   }
 }
 
-//------------------------------------------------------------------------