diff --git a/src/Extension/ConfigExtension.php b/src/Extension/ConfigExtension.php
index c623dbbada0b4d76c84717121415e84126fff160..ecfcf261d7311a38e859fc4d48a00e004e6ca2b4 100644
--- a/src/Extension/ConfigExtension.php
+++ b/src/Extension/ConfigExtension.php
@@ -5,14 +5,12 @@ declare(strict_types=1);
 namespace WPDesk\Init\Extension;
 
 use Psr\Container\ContainerInterface;
-use WPDesk\Init\Binding\DefinitionFactory;
 use WPDesk\Init\Binding\Loader\ArrayBindingLoader;
 use WPDesk\Init\Binding\Loader\BindingDefinitions;
 use WPDesk\Init\Binding\Loader\DirectoryBasedLoader;
 use WPDesk\Init\Configuration\Configuration;
 use WPDesk\Init\Configuration\ReadableConfig;
 use WPDesk\Init\DependencyInjection\ContainerBuilder;
-use WPDesk\Init\Loader\PhpFileLoader;
 use WPDesk\Init\Plugin\Plugin;
 use WPDesk\Init\Util\Path;
 
diff --git a/src/Init.php b/src/Init.php
index aa75eb6c8f550189eaf6d8eb4a0a5251ad463e6d..96e310ff397d52c42c3fc079b76643e91f9b4206 100644
--- a/src/Init.php
+++ b/src/Init.php
@@ -5,25 +5,12 @@
 
 namespace WPDesk\Init;
 
-use WPDesk\Init\Binding\Binder\CallableBinder;
-use WPDesk\Init\Binding\Binder\CompositeBinder;
-use WPDesk\Init\Binding\Binder\HookableBinder;
-use WPDesk\Init\Binding\Loader\DirectoryBasedLoader;
-use WPDesk\Init\Binding\DefinitionFactory;
-use WPDesk\Init\CommonBinding\I18n;
-use WPDesk\Init\Binding\Loader\ArrayBindingLoader;
-use WPDesk\Init\Binding\Loader\CompositeBindingLoader;
 use WPDesk\Init\Extension\LegacyExtension;
 use WPDesk\Init\Extension\BuiltinExtension;
 use WPDesk\Init\Extension\ConfigExtension;
 use WPDesk\Init\Extension\ExtensionsSet;
-use WPDesk\Init\HookDriver\CompositeDriver;
-use WPDesk\Init\HookDriver\GenericDriver;
-use WPDesk\Init\HookDriver\HookDriver;
-use WPDesk\Init\HookDriver\LegacyHookableDriver;
 use WPDesk\Init\Loader\PhpFileLoader;
 use WPDesk\Init\Configuration\Configuration;
-use WPDesk\Init\Util\Path;
 
 final class Init {
 
diff --git a/src/Kernel.php b/src/Kernel.php
index dd6097d7b2cd83a9ecc4ef5bf86f04d5f72ddd08..98bd6a9dd28737d676a37684540bdf47aae79fed 100644
--- a/src/Kernel.php
+++ b/src/Kernel.php
@@ -71,8 +71,7 @@ final class Kernel {
 		$container->set( Plugin::class, $plugin );
 		$container->set( Configuration::class, $this->config );
 
-		$driver = $this->prepare_driver( $container );
-		$driver->register_hooks( $this->config, $container );
+		$this->prepare_driver( $container )->register_hooks();
 	}
 
 	private function get_cache_path( string $path = '' ): string {