diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index fb0cdd244e40b1216a8b48a10ed6fe0b15864932..635b5824aa03576b47f72f398303d7cebee5c725 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -79,16 +79,16 @@ GModel::GModel(std::string name)
   // push new one into the list
   list.push_back(this);
 
-  // at the moment we always create (at least an empty) GEO model
+  // at the moment we always create (at least empty) internal GEO and OCC
+  // CAD models
   _createGEOInternals();
-
   _createOCCInternals();
 
-#if defined(HAVE_OCC)
-  setFactory("OpenCASCADE");
-#else
+  // FIXME: GModelFactory will be deprecated at some point, replaced by
+  // interfaces to internal CAD data (currently only OCC_Internals, soon
+  // GEO_Internals; and maybe an abstract "CAD_Internals", from which those
+  // would derive, with an "integer" API, easily wrapped in C or scripts)
   setFactory("Gmsh");
-#endif
 
 #if defined(HAVE_MESH)
   _fields = new FieldManager();
@@ -171,12 +171,6 @@ void GModel::setFactory(std::string name)
   }
 }
 
-std::string GModel::getFactoryName()
-{
-  if(!_factory) return "";
-  return _factory->getName();
-}
-
 GModel *GModel::findByName(const std::string &name, const std::string &fileName)
 {
   // return last mesh with given name
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 593d1a28b4cbd140ecd390fc1e41ebfb1e14a6f1..0630d6c2ad0cad37d1ead807157c815a3650a29c 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -501,7 +501,6 @@ class GModel
 
   // change the entity creation factory
   void setFactory(std::string name);
-  std::string getFactoryName();
 
   // create brep geometry entities using the factory
   GVertex *addVertex(double x, double y, double z, double lc);
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index c20115e4f383d49e1f64f74ca3bb67d981fce3c9..b27e96f1c296f3ac0674629685496f6c724f100d 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -8024,8 +8024,8 @@ yyreduce:
   case 170:
 #line 1719 "Gmsh.y"
     {
-      // FIXME: when changing to OpenCASCADE, get maxTag for all dimensions
-      // and add that info in OCC_Internals - same in the other direction
+      // FIXME: when changing to OpenCASCADE, get maxTags from GEO_Internals and
+      // add that info in OCC_Internals - same in the other direction
       factory = (yyvsp[(3) - (5)].c);
       Free((yyvsp[(3) - (5)].c));
     ;}
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 1923f2b73b396e787598d128e62d6be0669a4b71..9b67343de9b9b1a5614ab2f70be151db25430814 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1717,8 +1717,8 @@ Shape :
 
     tSetFactory '(' StringExprVar ')' tEND
     {
-      // FIXME: when changing to OpenCASCADE, get maxTag for all dimensions
-      // and add that info in OCC_Internals - same in the other direction
+      // FIXME: when changing to OpenCASCADE, get maxTags from GEO_Internals and
+      // add that info in OCC_Internals - same in the other direction
       factory = $3;
       Free($3);
     }