diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php
index 01cc6c316..37a8cb920 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php
@@ -19,24 +19,21 @@
 
 namespace Combodo\iTop\Portal\Controller;
 
-use \Silex\Application;
-use \Symfony\Component\HttpFoundation\Request;
-use \Exception;
-use \UserRights;
-use \Dict;
-use \MetaModel;
-use \DBSearch;
-use \DBObjectSearch;
-use \DBObjectSet;
-use \DBObject;
-use \BinaryExpression;
-use \FieldExpression;
-use \VariableExpression;
-use \Combodo\iTop\Portal\Helper\ApplicationHelper;
-use \Combodo\iTop\Portal\Helper\SecurityHelper;
-use \Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
-use \Combodo\iTop\Portal\Brick\AbstractBrick;
-use \Combodo\iTop\Portal\Brick\BrowseBrick;
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use UserRights;
+use Dict;
+use MetaModel;
+use DBSearch;
+use DBObjectSet;
+use BinaryExpression;
+use FieldExpression;
+use VariableExpression;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Helper\SecurityHelper;
+use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
+use Combodo\iTop\Portal\Brick\AbstractBrick;
+use Combodo\iTop\Portal\Brick\BrowseBrick;
 
 class BrowseBrickController extends BrickController
 {
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php
index 2d14938d6..8425a3738 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php
@@ -19,13 +19,13 @@
 
 namespace Combodo\iTop\Portal\Controller;
 
-use \Silex\Application;
-use \Symfony\Component\HttpFoundation\Request;
-use \Symfony\Component\HttpKernel\HttpKernelInterface;
-use \MetaModel;
-use \Combodo\iTop\Portal\Helper\ApplicationHelper;
-use \Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
-use \Combodo\iTop\Portal\Helper\SecurityHelper;
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use MetaModel;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
+use Combodo\iTop\Portal\Helper\SecurityHelper;
 
 class CreateBrickController extends BrickController
 {
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
index 577724a2c..62eeef9e0 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
@@ -20,34 +20,34 @@
 namespace Combodo\iTop\Portal\Controller;
 
 use Combodo\iTop\Portal\Helper\ScopeValidatorHelper;
-use \Silex\Application;
-use \Symfony\Component\HttpFoundation\Request;
-use \UserRights;
-use \CMDBSource;
-use \IssueLog;
-use \MetaModel;
-use \AttributeDefinition;
-use \AttributeDate;
-use \AttributeDateTime;
-use \AttributeDuration;
-use \AttributeSubItem;
-use \DBSearch;
-use \DBObjectSearch;
-use \DBObjectSet;
-use \DBObject;
-use \FieldExpression;
-use \BinaryExpression;
-use \VariableExpression;
-use \SQLExpression;
-use \UnaryExpression;
-use \Dict;
-use \iPopupMenuExtension;
-use \URLButtonItem;
-use \JSButtonItem;
-use \Combodo\iTop\Portal\Helper\ApplicationHelper;
-use \Combodo\iTop\Portal\Helper\SecurityHelper;
-use \Combodo\iTop\Portal\Brick\AbstractBrick;
-use \Combodo\iTop\Portal\Brick\ManageBrick;
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use UserRights;
+use CMDBSource;
+use IssueLog;
+use MetaModel;
+use AttributeDefinition;
+use AttributeDate;
+use AttributeDateTime;
+use AttributeDuration;
+use AttributeSubItem;
+use DBSearch;
+use DBObjectSearch;
+use DBObjectSet;
+use DBObject;
+use FieldExpression;
+use BinaryExpression;
+use VariableExpression;
+use SQLExpression;
+use UnaryExpression;
+use Dict;
+use iPopupMenuExtension;
+use URLButtonItem;
+use JSButtonItem;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Helper\SecurityHelper;
+use Combodo\iTop\Portal\Brick\AbstractBrick;
+use Combodo\iTop\Portal\Brick\ManageBrick;
 
 class ManageBrickController extends BrickController
 {
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
index 279d99643..029ab27d6 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
@@ -19,40 +19,40 @@
 
 namespace Combodo\iTop\Portal\Controller;
 
-use \Silex\Application;
-use \Symfony\Component\HttpFoundation\Request;
-use \Symfony\Component\HttpFoundation\Response;
-use \Symfony\Component\HttpFoundation\RedirectResponse;
-use \Symfony\Component\HttpKernel\HttpKernelInterface;
-use \Exception;
-use \FileUploadException;
-use \utils;
-use \Dict;
-use \IssueLog;
-use \MetaModel;
-use \DBObject;
-use \DBSearch;
-use \DBObjectSearch;
-use \FalseExpression;
-use \BinaryExpression;
-use \FieldExpression;
-use \VariableExpression;
-use \ListExpression;
-use \ScalarExpression;
-use \DBObjectSet;
-use \cmdbAbstractObject;
-use \AttributeEnum;
-use \AttributeFinalClass;
-use \AttributeFriendlyName;
-use \UserRights;
-use \iPopupMenuExtension;
-use \URLButtonItem;
-use \JSButtonItem;
-use \Combodo\iTop\Portal\Helper\ApplicationHelper;
-use \Combodo\iTop\Portal\Helper\SecurityHelper;
-use \Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
-use \Combodo\iTop\Portal\Form\ObjectFormManager;
-use \Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Exception;
+use FileUploadException;
+use utils;
+use Dict;
+use IssueLog;
+use MetaModel;
+use DBObject;
+use DBSearch;
+use DBObjectSearch;
+use FalseExpression;
+use BinaryExpression;
+use FieldExpression;
+use VariableExpression;
+use ListExpression;
+use ScalarExpression;
+use DBObjectSet;
+use cmdbAbstractObject;
+use AttributeEnum;
+use AttributeFinalClass;
+use AttributeFriendlyName;
+use UserRights;
+use iPopupMenuExtension;
+use URLButtonItem;
+use JSButtonItem;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Helper\SecurityHelper;
+use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
+use Combodo\iTop\Portal\Form\ObjectFormManager;
+use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
 
 /**
  * Controller to handle basic view / edit / create of cmdbAbstractObject
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
index 270efb5e8..cda957650 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
@@ -19,19 +19,19 @@
 
 namespace Combodo\iTop\Portal\Controller;
 
-use \Exception;
-use \IssueLog;
-use \utils;
-use \MetaModel;
-use \UserRights;
-use \Silex\Application;
-use \Symfony\Component\HttpFoundation\Request;
-use \Combodo\iTop\Portal\Helper\ApplicationHelper;
-use \Combodo\iTop\Portal\Brick\UserProfileBrick;
-use \Combodo\iTop\Portal\Controller\ObjectController;
-use \Combodo\iTop\Portal\Form\PreferencesFormManager;
-use \Combodo\iTop\Portal\Form\PasswordFormManager;
-use \Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
+use Exception;
+use IssueLog;
+use utils;
+use MetaModel;
+use UserRights;
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Brick\UserProfileBrick;
+use Combodo\iTop\Portal\Controller\ObjectController;
+use Combodo\iTop\Portal\Form\PreferencesFormManager;
+use Combodo\iTop\Portal\Form\PasswordFormManager;
+use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
 
 class UserProfileBrickController extends BrickController
 {
diff --git a/datamodels/2.x/itop-portal-base/portal/src/entities/abstractbrick.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/entities/abstractbrick.class.inc.php
index e16275dc2..754c77d0a 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/entities/abstractbrick.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/entities/abstractbrick.class.inc.php
@@ -22,10 +22,10 @@ namespace Combodo\iTop\Portal\Brick;
 require_once APPROOT . '/core/moduledesign.class.inc.php';
 require_once APPROOT . '/setup/compiler.class.inc.php';
 
-use \DOMXPath;
-use \DOMFormatException;
-use \ModuleDesign;
-use \Combodo\iTop\DesignElement;
+use DOMXPath;
+use DOMFormatException;
+use ModuleDesign;
+use Combodo\iTop\DesignElement;
 
 /**
  * Description of AbstractBrick
diff --git a/datamodels/2.x/itop-portal-base/portal/src/entities/browsebrick.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/entities/browsebrick.class.inc.php
index e323a8c4c..4e5506fe5 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/entities/browsebrick.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/entities/browsebrick.class.inc.php
@@ -19,9 +19,9 @@
 
 namespace Combodo\iTop\Portal\Brick;
 
-use \DOMFormatException;
-use \Combodo\iTop\DesignElement;
-use \Combodo\iTop\Portal\Brick\PortalBrick;
+use DOMFormatException;
+use Combodo\iTop\DesignElement;
+use Combodo\iTop\Portal\Brick\PortalBrick;
 
 /**
  * Description of BrowseBrick
diff --git a/datamodels/2.x/itop-portal-base/portal/src/entities/createbrick.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/entities/createbrick.class.inc.php
index f7ebc792f..c1a36f1b2 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/entities/createbrick.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/entities/createbrick.class.inc.php
@@ -19,9 +19,9 @@
 
 namespace Combodo\iTop\Portal\Brick;
 
-use \DOMFormatException;
-use \Combodo\iTop\DesignElement;
-use \Combodo\iTop\Portal\Brick\PortalBrick;
+use DOMFormatException;
+use Combodo\iTop\DesignElement;
+use Combodo\iTop\Portal\Brick\PortalBrick;
 
 /**
  * Description of CreateBrick
diff --git a/datamodels/2.x/itop-portal-base/portal/src/entities/filterbrick.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/entities/filterbrick.class.inc.php
index bc5e458c6..409221c95 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/entities/filterbrick.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/entities/filterbrick.class.inc.php
@@ -19,9 +19,9 @@
 
 namespace Combodo\iTop\Portal\Brick;
 
-use \Combodo\iTop\DesignElement;
-use \Combodo\iTop\Portal\Brick\PortalBrick;
-use \Combodo\iTop\Portal\Brick\BrowseBrick;
+use Combodo\iTop\DesignElement;
+use Combodo\iTop\Portal\Brick\PortalBrick;
+use Combodo\iTop\Portal\Brick\BrowseBrick;
 
 /**
  * Description of FilterBrick
diff --git a/datamodels/2.x/itop-portal-base/portal/src/entities/managebrick.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/entities/managebrick.class.inc.php
index dc858441d..3f8a1f696 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/entities/managebrick.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/entities/managebrick.class.inc.php
@@ -19,11 +19,11 @@
 
 namespace Combodo\iTop\Portal\Brick;
 
-use \Combodo\iTop\DesignElement;
-use \Combodo\iTop\Portal\Brick\PortalBrick;
 use DOMFormatException;
 use DBSearch;
 use MetaModel;
+use Combodo\iTop\DesignElement;
+use Combodo\iTop\Portal\Brick\PortalBrick;
 
 /**
  * Description of ManageBrick
diff --git a/datamodels/2.x/itop-portal-base/portal/src/entities/portalbrick.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/entities/portalbrick.class.inc.php
index 8107ff54f..ea1fb19ec 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/entities/portalbrick.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/entities/portalbrick.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,9 +19,8 @@
 
 namespace Combodo\iTop\Portal\Brick;
 
-use \ModuleDesign;
-use \Combodo\iTop\DesignElement;
-use \Combodo\iTop\Portal\Brick\AbstractBrick;
+use ModuleDesign;
+use Combodo\iTop\DesignElement;
 
 /**
  * Description of PortalBrick
diff --git a/datamodels/2.x/itop-portal-base/portal/src/entities/userprofilebrick.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/entities/userprofilebrick.class.inc.php
index 1f3d3eade..38b186b8f 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/entities/userprofilebrick.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/entities/userprofilebrick.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -18,9 +18,8 @@
 
 namespace Combodo\iTop\Portal\Brick;
 
-use \DOMFormatException;
-use \Combodo\iTop\DesignElement;
-use \Combodo\iTop\Portal\Brick\PortalBrick;
+use DOMFormatException;
+use Combodo\iTop\DesignElement;
 
 /**
  * Description of UserProfileBrick
diff --git a/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
index d08c7814a..c3936d5d7 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2018Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,31 +19,27 @@
 
 namespace Combodo\iTop\Portal\Form;
 
-use \Exception;
-use \Silex\Application;
-use \utils;
-use \Dict;
-use \IssueLog;
-use \UserRights;
-use \MetaModel;
-use \CMDBSource;
-use \DBObject;
-use \DBObjectSet;
-use \DBSearch;
-use \DBObjectSearch;
-use \BinaryExpression;
-use \FieldExpression;
-use \ScalarExpression;
-use \DBObjectSetComparator;
-use \InlineImage;
-use \AttributeDateTime;
-use \AttachmentPlugIn;
-use \Combodo\iTop\Form\FormManager;
-use \Combodo\iTop\Form\Form;
-use \Combodo\iTop\Form\Field\Field;
-use \Combodo\iTop\Form\Field\FileUploadField;
-use \Combodo\iTop\Form\Field\LabelField;
-use \Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Exception;
+use Silex\Application;
+use utils;
+use Dict;
+use IssueLog;
+use UserRights;
+use MetaModel;
+use CMDBSource;
+use DBObject;
+use DBObjectSet;
+use DBSearch;
+use DBObjectSearch;
+use InlineImage;
+use AttributeDateTime;
+use AttachmentPlugIn;
+use Combodo\iTop\Form\FormManager;
+use Combodo\iTop\Form\Form;
+use Combodo\iTop\Form\Field\Field;
+use Combodo\iTop\Form\Field\FileUploadField;
+use Combodo\iTop\Form\Field\LabelField;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
 
 /**
  * Description of objectformmanager
diff --git a/datamodels/2.x/itop-portal-base/portal/src/forms/passwordformmanager.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/forms/passwordformmanager.class.inc.php
index 4cfcb7387..c7f650c63 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/forms/passwordformmanager.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/forms/passwordformmanager.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2016 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,14 +19,13 @@
 
 namespace Combodo\iTop\Portal\Form;
 
-use \Exception;
-use \CMDBSource;
-use \Dict;
-use \UserRights;
-use \Combodo\iTop\Form\FormManager;
-use \Combodo\iTop\Form\Form;
-use \Combodo\iTop\Form\Field\HiddenField;
-use \Combodo\iTop\Form\Field\PasswordField;
+use Exception;
+use Dict;
+use UserRights;
+use Combodo\iTop\Form\FormManager;
+use Combodo\iTop\Form\Form;
+use Combodo\iTop\Form\Field\HiddenField;
+use Combodo\iTop\Form\Field\PasswordField;
 
 /**
  * Description of passwordformmanager
diff --git a/datamodels/2.x/itop-portal-base/portal/src/forms/preferencesformmanager.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/forms/preferencesformmanager.class.inc.php
index a74d5b66d..d203cef6d 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/forms/preferencesformmanager.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/forms/preferencesformmanager.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2016 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,14 +19,14 @@
 
 namespace Combodo\iTop\Portal\Form;
 
-use \Exception;
-use \CMDBSource;
-use \Dict;
-use \UserRights;
-use \Combodo\iTop\Form\FormManager;
-use \Combodo\iTop\Form\Form;
-use \Combodo\iTop\Form\Field\HiddenField;
-use \Combodo\iTop\Form\Field\SelectField;
+use Exception;
+use CMDBSource;
+use Dict;
+use UserRights;
+use Combodo\iTop\Form\FormManager;
+use Combodo\iTop\Form\Form;
+use Combodo\iTop\Form\Field\HiddenField;
+use Combodo\iTop\Form\Field\SelectField;
 
 /**
  * Description of preferencesformmanager
diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
index 71c8a1d2b..00116050f 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,26 +19,24 @@
 
 namespace Combodo\iTop\Portal\Helper;
 
-use \Exception;
-use \Silex\Application;
-use \Symfony\Component\Debug\ErrorHandler;
-use \Symfony\Component\Debug\ExceptionHandler;
-use \Symfony\Component\HttpFoundation\Request;
-use \Twig_Environment;
-use \Twig_SimpleFilter;
-use \Dict;
-use \utils;
-use \IssueLog;
-use \UserRights;
-use \CMDBSource;
-use \DOMFormatException;
-use \ModuleDesign;
-use \MetaModel;
-use \DBObjectSearch;
-use \DBObjectSet;
-use \iPortalUIExtension;
-use \ApplicationContext;
-use \Combodo\iTop\Portal\Brick\AbstractBrick;
+use Exception;
+use Silex\Application;
+use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\Debug\ExceptionHandler;
+use Twig_Environment;
+use Twig_SimpleFilter;
+use Dict;
+use utils;
+use IssueLog;
+use UserRights;
+use DOMFormatException;
+use ModuleDesign;
+use MetaModel;
+use DBObjectSearch;
+use DBObjectSet;
+use iPortalUIExtension;
+use ApplicationContext;
+use Combodo\iTop\Portal\Brick\AbstractBrick;
 
 /**
  * Contains static methods to help loading / registering classes of the application.
diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/contextmanipulatorhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/contextmanipulatorhelper.class.inc.php
index bfec77b9b..1d5b15f0d 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/helpers/contextmanipulatorhelper.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/contextmanipulatorhelper.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,20 +19,17 @@
 
 namespace Combodo\iTop\Portal\Helper;
 
-use \Exception;
-use \Silex\Application;
-use \DOMNodeList;
-use \DOMFormatException;
-use \UserRights;
-use \DBObject;
-use \DBSearch;
-use \DBObjectSet;
-use \BinaryExpression;
-use \FieldExpression;
-use \ScalarExpression;
-use \iTopObjectCopier;
-use \Combodo\iTop\DesignElement;
-use \Combodo\iTop\Portal\Brick\Portalbrick;
+use Exception;
+use Silex\Application;
+use DOMNodeList;
+use DOMFormatException;
+use UserRights;
+use DBObject;
+use DBSearch;
+use DBObjectSet;
+use BinaryExpression;
+use FieldExpression;
+use ScalarExpression;
 
 class ContextManipulatorHelper
 {
diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/lifecyclevalidatorhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/lifecyclevalidatorhelper.class.inc.php
index 6aa45a8ad..a06db9a25 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/helpers/lifecyclevalidatorhelper.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/lifecyclevalidatorhelper.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,13 +19,13 @@
 
 namespace Combodo\iTop\Portal\Helper;
 
-use \Exception;
-use \DOMNodeList;
-use \DOMFormatException;
-use \utils;
-use \ProfilesConfig;
-use \MetaModel;
-use \DBSearch;
+use Exception;
+use DOMNodeList;
+use DOMFormatException;
+use utils;
+use ProfilesConfig;
+use MetaModel;
+use DBSearch;
 
 class LifecycleValidatorHelper
 {
diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/scopevalidatorhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/scopevalidatorhelper.class.inc.php
index 375b9d0be..81f7bc8bc 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/helpers/scopevalidatorhelper.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/scopevalidatorhelper.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,15 +19,14 @@
 
 namespace Combodo\iTop\Portal\Helper;
 
-use \Exception;
-use \DOMNodeList;
-use \DOMFormatException;
-use \utils;
-use \ProfilesConfig;
-use \MetaModel;
-use \DBSearch;
-use \DBUnionSearch;
-use \Combodo\iTop\DesignElement;
+use Exception;
+use DOMNodeList;
+use DOMFormatException;
+use utils;
+use ProfilesConfig;
+use MetaModel;
+use DBSearch;
+use DBUnionSearch;
 
 class ScopeValidatorHelper
 {
diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/securityhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/securityhelper.class.inc.php
index adac98b65..479fdd5f7 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/helpers/securityhelper.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/securityhelper.class.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -19,20 +19,16 @@
 
 namespace Combodo\iTop\Portal\Helper;
 
-use \Exception;
-use \Silex\Application;
-use \utils;
-use \UserRights;
-use \Dict;
-use \IssueLog;
-use \MetaModel;
-use \DBSearch;
-use \DBObjectSearch;
-use \DBObjectSet;
-use \FieldExpression;
-use \VariableExpression;
-use \BinaryExpression;
-use \Combodo\iTop\Portal\Helper\ScopeValidatorHelper;
+use Silex\Application;
+use UserRights;
+use IssueLog;
+use MetaModel;
+use DBSearch;
+use DBObjectSearch;
+use DBObjectSet;
+use FieldExpression;
+use VariableExpression;
+use BinaryExpression;
 
 /**
  * SecurityHelper class
diff --git a/datamodels/2.x/itop-portal-base/portal/web/index.php b/datamodels/2.x/itop-portal-base/portal/web/index.php
index 32975bc77..081c7dc15 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/index.php
+++ b/datamodels/2.x/itop-portal-base/portal/web/index.php
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -43,8 +43,8 @@ require_once __DIR__ . '/../src/helpers/lifecyclevalidatorhelper.class.inc.php';
 require_once __DIR__ . '/../src/helpers/securityhelper.class.inc.php';
 require_once __DIR__ . '/../src/helpers/applicationhelper.class.inc.php';
 
-use \Silex\Application;
-use \Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Silex\Application;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
 
 // Stacking context tag so it knows we are in the portal
 $oContex = new ContextTag('GUI:Portal');