diff --git a/src/GEOM_SWIG/CMakeLists.txt b/src/GEOM_SWIG/CMakeLists.txt
index c29198e15..ee035a057 100755
--- a/src/GEOM_SWIG/CMakeLists.txt
+++ b/src/GEOM_SWIG/CMakeLists.txt
@@ -21,7 +21,6 @@
 
 # scripts / samples,data
 SET(_other_SCRIPTS
-  geompy.py
   GEOM_Spanner.py
   GEOM_blocks.py
   GEOM_example.py
diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py
index 0a2b7d810..aef06e34e 100644
--- a/src/GEOM_SWIG/geomBuilder.py
+++ b/src/GEOM_SWIG/geomBuilder.py
@@ -14048,6 +14048,10 @@ def New( instance=None):
     global engine
     global geom
     global doLcc
+    if instance and isinstance( instance, SALOMEDS._objref_Study ):
+        import sys
+        sys.stderr.write("Warning: 'study' argument is no more needed in geomBuilder.New(). Consider updating your script!!!\n\n")
+        instance = None
     engine = instance
     if engine is None:
       doLcc = True
diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py
deleted file mode 100644
index 0706e69b6..000000000
--- a/src/GEOM_SWIG/geompy.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-#  GEOM GEOM_SWIG : binding of C++ implementation with Python
-#  File   : geompy.py
-#  Author : Paul RASCLE, EDF
-#  Module : GEOM
-#
-import salome
-from salome.geom import geomBuilder
-from salome import *
-import GEOM
-from salome.geom.geomBuilder import info, PackData, ReadTexture, EnumToLong
-
-# retrieve GEOM engine in try/except block
-# to avoid problems in some cases, e.g. when generating documentation
-try:
-    # get GEOM engine and initialize GEOM with current study
-    engineGeom = lcc.FindOrLoadComponent( "FactoryServer", "GEOM" )
-    geom = geomBuilder.New(engineGeom)
-
-    # export the methods of geomBuilder
-    for k in dir( geom ):
-        if k[0] == '_': continue
-        globals()[k] = getattr( geom, k )
-        pass
-    del k
-    ShapeType = geom.ShapeType
-    kind      = geom.kind
-    pass
-except:
-    print("exception in geompy.py")
-    geom = None
-    pass
-
-print("""
-===============================================================================
-WARNING:
-Usage of geompy.py is deprecated after SALOME V7.2!
-geompy.py will be removed in a future version!
-TODO:
-The following changes in your scripts are required to avoid this message:
-
-replace
--------
-
-import geompy
-geompy.init_geom()
-
-with
-----
-
-from salome.geom import geomBuilder
-geompy = geomBuilder.New()
-
-See also GEOM User's Guide for more details
-
-WARNING:
-The geompy.py module works correctly only in first created study.
-It does not work in second, third, etc studies!
-
-===============================================================================
-""")