diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h b/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
index b229385ac682baa3c8f2073f8deb49ecdf7611d9..9194ef811de5c4b53e6c8e9a2178079618ef2c20 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
@@ -137,9 +137,6 @@ namespace version_proxy
   OTBGdalAdapters_EXPORT 
   GDALDriverType *  GetDriverByName(const char * name);
 
-  OTBGdalAdapters_EXPORT
-  std::string GetDriverNameFromDataSource(const GDALDatasetType * ds);
-
   /**
    * Return the list of files composing the dataset.
    * 
diff --git a/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
index db2ac781417d4d3d9cda0efb20eee318cb1dc204..7a70e6efb2cb676f9cd508f28c51677bc24653eb 100644
--- a/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
+++ b/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
@@ -201,15 +201,6 @@ std::vector<std::string> GetAvailableDriversAsStringVector()
   return ret;
 }
 
-std::string GetDriverNameFromDataSource(const GDALDatasetType * ds)
-{
-#if GDAL_VERSION_NUM<2000000
-  return std::string(const_cast<GDALDatasetType *>(ds)->GetDriver()->GetName());
-#else
-  return std::string(const_cast<GDALDatasetType *>(ds)->GetDriverName());
-#endif
-}
-
 /*----------------------[GDAL 2.2 change on IsFieldSet()]---------------------*/
 bool IsFieldSetAndNotNull(OGRFeature *feat, int index)
 {
diff --git a/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
index ab2ea6779d2ac2f078ac11d3c15b72926a406cb7..b3594c3b38014b89e018b923e0ec17c3a61cf50c 100644
--- a/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
@@ -689,7 +689,7 @@ private:
         //Note : the GetDriver() Method has not been encapsulated in otb::ogr::DataSource,
         //so we must access the OGR pointer by using .ogr()
 
-        std::string driverName(otb::ogr::version_proxy::GetDriverNameFromDataSource(&ogrDS->ogr()));
+        std::string driverName(ogrDS->ogr().GetDriverName());
         if ( driverName.find("ESRI Shapefile") != std::string::npos)
           {
           otbAppLogINFO(<<"REPACK the Shapefile ..."<<std::endl);