diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index 8bb56b9fce..c2c91d22d4 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -314,7 +314,7 @@ class Application extends SilexApplication
             ],
         ]);
 
-        $this['translator'] = $this->share($this->extend('translator', function(CachedTranslator $translator, $app) {
+        $this['translator'] = $this->share($this->extend('translator', function (CachedTranslator $translator, $app) {
             $translator->addResource('xliff', __DIR__.'/../../../resources/locales/messages.fr.xliff', 'fr', 'messages');
             $translator->addResource('xliff', __DIR__.'/../../../resources/locales/validators.fr.xliff', 'fr', 'validators');
             $translator->addResource('xliff', __DIR__.'/../../../resources/locales/messages.en.xliff', 'en', 'messages');
diff --git a/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.php b/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.php
index dbb3656405..ee11d5bd9f 100644
--- a/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.php
@@ -41,7 +41,7 @@ interface CheckerInterface
     /**
      * Get a localized message about the Checker
      *
-     * @param  TranslatorInterface    $translator A translator
+     * @param TranslatorInterface $translator A translator
      *
      * @return string
      */
diff --git a/lib/Alchemy/Phrasea/Command/Developer/TranslationDumper.php b/lib/Alchemy/Phrasea/Command/Developer/TranslationDumper.php
index 95b379f15e..f68c9ccf5b 100644
--- a/lib/Alchemy/Phrasea/Command/Developer/TranslationDumper.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/TranslationDumper.php
@@ -12,7 +12,6 @@
 namespace Alchemy\Phrasea\Command\Developer;
 
 use Alchemy\Phrasea\Command\Command;
-use Doctrine\Common\Annotations\DocParser;
 use JMS\TranslationBundle\Translation\ConfigBuilder;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/lib/Alchemy/Phrasea/Core/CLIProvider/TranslationExtractorServiceProvider.php b/lib/Alchemy/Phrasea/Core/CLIProvider/TranslationExtractorServiceProvider.php
index b0e903e4d9..acefff9d43 100644
--- a/lib/Alchemy/Phrasea/Core/CLIProvider/TranslationExtractorServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/CLIProvider/TranslationExtractorServiceProvider.php
@@ -12,11 +12,9 @@
 namespace Alchemy\Phrasea\Core\CLIProvider;
 
 use Alchemy\Phrasea\Command\Developer\Utils\ConstraintExtractor;
-use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\DocParser;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Gedmo\SoftDeleteable\Mapping\Driver\Annotation;
-use JMS\TranslationBundle\Translation\ConfigBuilder;
 use JMS\TranslationBundle\Translation\Dumper\SymfonyDumperAdapter;
 use JMS\TranslationBundle\Translation\Dumper\XliffDumper;
 use JMS\TranslationBundle\Translation\Extractor\File\DefaultPhpFileExtractor;
@@ -30,12 +28,10 @@ use JMS\TranslationBundle\Translation\Loader\SymfonyLoaderAdapter;
 use JMS\TranslationBundle\Translation\Loader\XliffLoader;
 use JMS\TranslationBundle\Translation\LoaderManager;
 use JMS\TranslationBundle\Translation\Updater;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Translation\Dumper\PoFileDumper;
 use Symfony\Component\Translation\Loader\PoFileLoader;
 use Silex\Application;
 use Silex\ServiceProviderInterface;
-use Symfony\Component\Process\PhpExecutableFinder;
 
 class TranslationExtractorServiceProvider implements ServiceProviderInterface
 {
diff --git a/lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php b/lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php
index f31cba5fc6..50e63a687f 100644
--- a/lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php
+++ b/lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php
@@ -75,9 +75,9 @@ class DisplaySettingService
     /**
      * Return a user setting given a user.
      *
-     * @param User $user
+     * @param User   $user
      * @param string $name
-     * @param mixed $default
+     * @param mixed  $default
      *
      * @return mixed
      */
@@ -96,7 +96,7 @@ class DisplaySettingService
      * Returns application setting value.
      *
      * @param string|array $props
-     * @param mixed $default
+     * @param mixed        $default
      *
      * @return mixed
      */
diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php
index 59d2fcc3fa..2b85c54498 100644
--- a/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php
+++ b/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php
@@ -12,7 +12,6 @@
 namespace Alchemy\Phrasea\Setup\Requirements;
 
 use Alchemy\Phrasea\Setup\RequirementCollection;
-use Alchemy\Phrasea\Application as PhraseaApplication;
 
 class LocalesRequirements extends RequirementCollection implements RequirementInterface
 {
diff --git a/lib/classes/Bridge/Api/Interface.php b/lib/classes/Bridge/Api/Interface.php
index 62a3924cc0..fffd355975 100644
--- a/lib/classes/Bridge/Api/Interface.php
+++ b/lib/classes/Bridge/Api/Interface.php
@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\HttpFoundation\Request;
 
 interface Bridge_Api_Interface
diff --git a/lib/classes/patch/390alpha9a.php b/lib/classes/patch/390alpha9a.php
index 1d1c7dbf98..240dc5fdf1 100644
--- a/lib/classes/patch/390alpha9a.php
+++ b/lib/classes/patch/390alpha9a.php
@@ -10,7 +10,6 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Model\Entities\Task;
 
 class patch_390alpha9a implements patchInterface
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Entities/UserTest.php b/tests/Alchemy/Tests/Phrasea/Model/Entities/UserTest.php
index c2a8203b8e..b01cf35ddf 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Entities/UserTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Entities/UserTest.php
@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\Model\Entities;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Model\Entities\User;
-use Alchemy\Phrasea\Model\Entities\UserSetting;
 
 class UserTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php b/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php
index 69b4300258..8ebf420569 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php
@@ -2,10 +2,6 @@
 
 namespace Alchemy\Tests\Phrasea\Model\Manipulator;
 
-use Alchemy\Phrasea\Model\Entities\UserNotificationSetting;
-use Alchemy\Phrasea\Model\Entities\UserQuery;
-use Alchemy\Phrasea\Model\Entities\UserSetting;
-
 class UserManagerTest extends \PhraseanetPHPUnitAbstract
 {
     public function testNewUser()
diff --git a/tests/classes/PhraseanetPHPUnitAbstract.php b/tests/classes/PhraseanetPHPUnitAbstract.php
index 2ce55acd1b..8683623b8d 100644
--- a/tests/classes/PhraseanetPHPUnitAbstract.php
+++ b/tests/classes/PhraseanetPHPUnitAbstract.php
@@ -789,9 +789,9 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
     /**
      * Inserts one user.
      *
-     * @param string    $login
-     * @param null      $email
-     * @param bool      $admin
+     * @param string $login
+     * @param null   $email
+     * @param bool   $admin
      *
      * @return User
      */
@@ -806,7 +806,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
      * @param string $method     The request method
      * @param string $uri        The URI to fetch
      * @param array  $parameters The Request parameters
-     * @param string  $httpAccept Contents of the Accept header
+     * @param string $httpAccept Contents of the Accept header
      *
      * @return Crawler
      */