diff --git a/build/lemonldap-ng/debian/control b/build/lemonldap-ng/debian/control
index e5baea3fd..08bb1ce5e 100644
--- a/build/lemonldap-ng/debian/control
+++ b/build/lemonldap-ng/debian/control
@@ -5,10 +5,9 @@ Maintainer: Xavier Guimard <x.guimard@free.fr>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7), po-debconf
 Build-Depends-Indep:libapache-session-perl, libnet-ldap-perl, libdbi-perl,
- libwww-perl, libcache-cache-perl, libcgi-session-perl, libcrypt-rijndael-perl,
- libxml-libxslt-perl, libio-string-perl, libregexp-assemble-perl, liburi-perl,
- libstring-random-perl, libmime-lite-perl, libsoap-lite-perl,
- libconfig-inifiles-perl
+ libwww-perl, libcache-cache-perl, libcrypt-rijndael-perl, libxml-libxslt-perl,
+ libio-string-perl, libregexp-assemble-perl, liburi-perl, libstring-random-perl,
+ libmime-lite-perl, libsoap-lite-perl, libconfig-inifiles-perl
 Standards-Version: 3.8.3
 Homepage: http://lemonldap.ow2.org/
 
@@ -79,7 +78,7 @@ Depends: ${misc:Depends}, libapache-session-perl, libnet-ldap-perl,
  libxml-libxml-perl, libxml-libxslt-perl, libstring-random-perl,
  libsoap-lite-perl
 Recommends: libmime-lite-perl, libemail-date-format-perl
-Suggests: liblasso-perl, libcgi-session-perl, slapd
+Suggests: liblasso-perl, slapd
 Description: Lemonldap::NG authentication portal part
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
  or directly on application Apache servers.
diff --git a/modules/lemonldap-ng-portal/META.yml b/modules/lemonldap-ng-portal/META.yml
index ceb5c8b42..d99ea5772 100644
--- a/modules/lemonldap-ng-portal/META.yml
+++ b/modules/lemonldap-ng-portal/META.yml
@@ -13,7 +13,6 @@ build_requires:
 requires:
     Apache::Session:      0
     CGI:                  3.08
-    CGI::Session:         0
     HTML::Template:       0
     IO::String:           0
     Lemonldap::NG::Common:  0.93
diff --git a/modules/lemonldap-ng-portal/Makefile.PL b/modules/lemonldap-ng-portal/Makefile.PL
index ad65a4c6d..379c860fb 100644
--- a/modules/lemonldap-ng-portal/Makefile.PL
+++ b/modules/lemonldap-ng-portal/Makefile.PL
@@ -19,7 +19,6 @@ WriteMakefile(
         'Apache::Session'        => 0,
         'Net::LDAP'              => 0,
         'CGI'                    => 3.08,
-        'CGI::Session'           => 0,
         'HTML::Template'         => 0,
         'Lemonldap::NG::Common'  => 0.93,
         'Lemonldap::NG::Handler' => 0.91,
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthSAML.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthSAML.pm
index 4c86a0d9c..c083f8051 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthSAML.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthSAML.pm
@@ -11,6 +11,7 @@ use Lemonldap::NG::Portal::_SAML;    #inherits
 use Lemonldap::NG::Common::Conf::SAML::Metadata;
 
 our $VERSION = '0.1';
+our @ISA = qw(Lemonldap::NG::Portal::_SAML);
 
 ## @apmethod int authInit()
 # Load Lasso and metadata
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/IssuerDBSAML.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/IssuerDBSAML.pm
index 3878e2485..1a7d16fed 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/IssuerDBSAML.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/IssuerDBSAML.pm
@@ -7,6 +7,8 @@ package Lemonldap::NG::Portal::IssuerDBSAML;
 
 use strict;
 use Lemonldap::NG::Portal::Simple;
+use Lemonldap::NG::Portal::_SAML;
+our @ISA = qw(Lemonldap::NG::Portal::_SAML);
 
 our $VERSION = '0.01';
 
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
index 3c1f68f86..9e8d4a334 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
@@ -138,6 +138,7 @@ our $self;    # Safe cannot share a variable declared with my
 #@return Lemonldap::NG::Portal::Simple object
 sub new {
 
+    @ISA = qw(Lemonldap::NG::Common::CGI Exporter);
     binmode( STDOUT, ":utf8" );
     my $class = shift;
     return $class if ( ref($class) );
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBSAML.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBSAML.pm
index 3cdd7c36d..14c5f3d90 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBSAML.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBSAML.pm
@@ -7,6 +7,8 @@ package Lemonldap::NG::Portal::UserDBSAML;
 
 use strict;
 use Lemonldap::NG::Portal::Simple;
+use Lemonldap::NG::Portal::_SAML;
+our @ISA = qw(Lemonldap::NG::Portal::_SAML);
 
 our $VERSION = '0.01';
 
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SAML.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SAML.pm
index fd5da0b8f..64f2a9c87 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SAML.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SAML.pm
@@ -6,25 +6,11 @@
 package Lemonldap::NG::Portal::_SAML;
 
 use strict;
-use base qw(Exporter);
 use XML::Simple;
 use MIME::Base64;
 use LWP::UserAgent;    # SOAP call
 use HTTP::Request;     # SOAP call
 
-our @EXPORT = qw(
-  loadLasso checkLassoError createServer addIDP addProvider getOrganizationName
-  createAuthnRequest createLogin getHttpMethod initAuthnRequest
-  buildAuthnRequestMsg processAuthnResponseMsg getNameIdentifier
-  createIdentity createSession acceptSSO
-  storeRelayState extractRelayState
-  getAssertion getAttributeValue validateConditions
-  createLogoutRequest createLogout initLogoutRequest buildLogoutRequestMsg
-  setSessionFromDump getMetaDataURL processLogoutResponseMsg processLogoutRequestMsg
-  validateLogoutRequest buildLogoutResponseMsg replayProtection
-  resolveArtifact processArtResponseMsg sendSOAPMessage
-);
-
 our $VERSION = '0.01';
 our $_samlCache;