diff --git a/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.php b/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.php
index 68e094f463..48cd43e687 100644
--- a/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.php
+++ b/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.php
@@ -11,7 +11,6 @@
 
 namespace Alchemy\Phrasea\Authentication;
 
-use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Authentication\Exception\NotAuthenticatedException;
 use Alchemy\Phrasea\Authentication\Provider\Token\Token;
 use Alchemy\Phrasea\Authentication\Provider\Token\Identity;
diff --git a/lib/Alchemy/Phrasea/Command/Plugin/DisablePlugin.php b/lib/Alchemy/Phrasea/Command/Plugin/DisablePlugin.php
index 639dc47ecd..e90d894979 100644
--- a/lib/Alchemy/Phrasea/Command/Plugin/DisablePlugin.php
+++ b/lib/Alchemy/Phrasea/Command/Plugin/DisablePlugin.php
@@ -13,7 +13,6 @@ namespace Alchemy\Phrasea\Command\Plugin;
 
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DisablePlugin extends AbstractPluginCommand
diff --git a/lib/Alchemy/Phrasea/Command/Plugin/EnablePlugin.php b/lib/Alchemy/Phrasea/Command/Plugin/EnablePlugin.php
index 08a9c9de3b..02b4830419 100644
--- a/lib/Alchemy/Phrasea/Command/Plugin/EnablePlugin.php
+++ b/lib/Alchemy/Phrasea/Command/Plugin/EnablePlugin.php
@@ -13,7 +13,6 @@ namespace Alchemy\Phrasea\Command\Plugin;
 
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class EnablePlugin extends AbstractPluginCommand
diff --git a/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.php b/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.php
index db089df083..a40b64e27f 100644
--- a/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.php
+++ b/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.php
@@ -12,7 +12,6 @@
 namespace Alchemy\Phrasea\Command\Plugin;
 
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 
diff --git a/lib/Alchemy/Phrasea/Controller/Setup.php b/lib/Alchemy/Phrasea/Controller/Setup.php
index 5769c84557..f800a0b140 100644
--- a/lib/Alchemy/Phrasea/Controller/Setup.php
+++ b/lib/Alchemy/Phrasea/Controller/Setup.php
@@ -18,7 +18,6 @@ use Alchemy\Phrasea\Setup\Requirements\LocalesRequirements;
 use Alchemy\Phrasea\Setup\Requirements\PhpRequirements;
 use Alchemy\Phrasea\Setup\Requirements\PhraseaRequirements;
 use Alchemy\Phrasea\Setup\Requirements\SystemRequirements;
-use Doctrine\DBAL\Connection;
 use Silex\ControllerProviderInterface;
 use Silex\Application as SilexApplication;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/lib/Alchemy/Phrasea/Core/CLIProvider/PluginServiceProvider.php b/lib/Alchemy/Phrasea/Core/CLIProvider/PluginServiceProvider.php
index d8c849185c..7d505c4c3d 100644
--- a/lib/Alchemy/Phrasea/Core/CLIProvider/PluginServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/CLIProvider/PluginServiceProvider.php
@@ -11,17 +11,13 @@
 
 namespace Alchemy\Phrasea\Core\CLIProvider;
 
-use Alchemy\Phrasea\Plugin\PluginManager;
-use Alchemy\Phrasea\Plugin\Schema\ManifestValidator;
 use Alchemy\Phrasea\Plugin\Management\PluginsExplorer;
 use Alchemy\Phrasea\Plugin\Management\ComposerInstaller;
-use Alchemy\Phrasea\Plugin\Schema\PluginValidator;
 use Alchemy\Phrasea\Plugin\Importer\Importer;
 use Alchemy\Phrasea\Plugin\Importer\ImportStrategy;
 use Alchemy\Phrasea\Plugin\Importer\FolderImporter;
 use Alchemy\Phrasea\Plugin\Management\AutoloaderGenerator;
 use Alchemy\Phrasea\Plugin\Management\AssetsManager;
-use JsonSchema\Validator as JsonValidator;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Silex\Application;
 use Silex\ServiceProviderInterface;
diff --git a/lib/Alchemy/Phrasea/Core/Connection/ConnectionProvider.php b/lib/Alchemy/Phrasea/Core/Connection/ConnectionProvider.php
index 90f4b6000a..b236201fc2 100644
--- a/lib/Alchemy/Phrasea/Core/Connection/ConnectionProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Connection/ConnectionProvider.php
@@ -61,4 +61,3 @@ class ConnectionProvider
         return $this->connections[$key] = DriverManager::getConnection($params, $this->config, $this->eventManager);;
     }
 }
-
diff --git a/lib/Alchemy/Phrasea/Form/Login/PhraseaRecoverPasswordForm.php b/lib/Alchemy/Phrasea/Form/Login/PhraseaRecoverPasswordForm.php
index 87e47beeec..e7f21225d1 100644
--- a/lib/Alchemy/Phrasea/Form/Login/PhraseaRecoverPasswordForm.php
+++ b/lib/Alchemy/Phrasea/Form/Login/PhraseaRecoverPasswordForm.php
@@ -11,7 +11,6 @@
 
 namespace Alchemy\Phrasea\Form\Login;
 
-use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Form\Constraint\PasswordToken;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/lib/Alchemy/Phrasea/Plugin/PluginManager.php b/lib/Alchemy/Phrasea/Plugin/PluginManager.php
index 4a784c63fc..b6cc4f253e 100644
--- a/lib/Alchemy/Phrasea/Plugin/PluginManager.php
+++ b/lib/Alchemy/Phrasea/Plugin/PluginManager.php
@@ -14,7 +14,6 @@ namespace Alchemy\Phrasea\Plugin;
 use Alchemy\Phrasea\Core\Configuration\PropertyAccess;
 use Alchemy\Phrasea\Plugin\Schema\PluginValidator;
 use Alchemy\Phrasea\Plugin\Exception\PluginValidationException;
-use Symfony\Component\Finder\Finder;
 
 class PluginManager
 {
diff --git a/lib/classes/API/OAuth2/Adapter.php b/lib/classes/API/OAuth2/Adapter.php
index df9869b9f9..6a2bda20e7 100644
--- a/lib/classes/API/OAuth2/Adapter.php
+++ b/lib/classes/API/OAuth2/Adapter.php
@@ -497,7 +497,7 @@ class API_OAuth2_Adapter extends OAuth2
 
     /**
      *
-     * @param  User             $user
+     * @param  User               $user
      * @return API_OAuth2_Account
      */
     public function updateAccount(User $user)
diff --git a/lib/classes/databox/field.php b/lib/classes/databox/field.php
index 377c133ea5..0f712a7502 100644
--- a/lib/classes/databox/field.php
+++ b/lib/classes/databox/field.php
@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Vocabulary;
 use Alchemy\Phrasea\Vocabulary\ControlProvider\ControlProviderInterface;
diff --git a/tests/Alchemy/Tests/Phrasea/Command/Plugin/DisablePluginTest.php b/tests/Alchemy/Tests/Phrasea/Command/Plugin/DisablePluginTest.php
index 62eee1b6c3..a7a8f9fa3e 100644
--- a/tests/Alchemy/Tests/Phrasea/Command/Plugin/DisablePluginTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Command/Plugin/DisablePluginTest.php
@@ -3,7 +3,6 @@
 namespace Alchemy\Tests\Phrasea\Command\Plugin;
 
 use Alchemy\Phrasea\Command\Plugin\DisablePlugin;
-use Symfony\Component\Yaml\Yaml;
 
 class DisablePluginTest extends PluginCommandTestCase
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Command/Plugin/EnablePluginTest.php b/tests/Alchemy/Tests/Phrasea/Command/Plugin/EnablePluginTest.php
index b1b1a17055..be78123757 100644
--- a/tests/Alchemy/Tests/Phrasea/Command/Plugin/EnablePluginTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Command/Plugin/EnablePluginTest.php
@@ -3,8 +3,6 @@
 namespace Alchemy\Tests\Phrasea\Command\Plugin;
 
 use Alchemy\Phrasea\Command\Plugin\EnablePlugin;
-use Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider;
-use Symfony\Component\Yaml\Yaml;
 
 class EnablePluginTest extends PluginCommandTestCase
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/PluginServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/PluginServiceProviderTest.php
index c16a745533..e339b7431b 100644
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/PluginServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/PluginServiceProviderTest.php
@@ -2,8 +2,6 @@
 
 namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-use Symfony\Component\Process\ExecutableFinder;
-
 /**
  * @covers Alchemy\Phrasea\Core\Provider\PluginServiceProvider
  */