diff --git a/config/services.yml b/config/services.yml
index 463db275..16e13129 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -18,7 +18,7 @@ services:
       $projectDir: '%kernel.project_dir%'
       $csrfTokenName: '%contao.csrf_token_name%'
 
-  HeimrichHannot\UtilsBundle\Util\Container\ContainerUtil:
+  HeimrichHannot\UtilsBundle\Util\ContainerUtil:
     autowire: true
     autoconfigure: true
     tags:
diff --git a/src/Util/Utils.php b/src/Util/Utils.php
index 2cdf3706..850c8b3f 100644
--- a/src/Util/Utils.php
+++ b/src/Util/Utils.php
@@ -8,14 +8,10 @@
 
 namespace HeimrichHannot\UtilsBundle\Util;
 
-use HeimrichHannot\UtilsBundle\Util\ContainerUtil;
-use HeimrichHannot\UtilsBundle\Util\AnonymizeUtil;
 use HeimrichHannot\UtilsBundle\Util\DatabaseUtil\DatabaseUtil;
 use HeimrichHannot\UtilsBundle\Util\DcaUtil\DcaUtil;
-use HeimrichHannot\UtilsBundle\Util\FileUtil;
 use HeimrichHannot\UtilsBundle\Util\HtmlUtil\HtmlUtil;
 use HeimrichHannot\UtilsBundle\Util\Locale\LocaleUtil;
-use HeimrichHannot\UtilsBundle\Util\ModelUtil;
 use HeimrichHannot\UtilsBundle\Util\Request\RequestUtil;
 use HeimrichHannot\UtilsBundle\Util\Request\UrlUtil;
 use HeimrichHannot\UtilsBundle\Util\Routing\RoutingUtil;
diff --git a/tests/ContaoManager/PluginTest.php b/tests/ContaoManager/PluginTest.php
index 5bccc57e..978c2c4f 100644
--- a/tests/ContaoManager/PluginTest.php
+++ b/tests/ContaoManager/PluginTest.php
@@ -12,27 +12,8 @@
 use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
 use Contao\ManagerPlugin\Bundle\Parser\DelegatingParser;
 use Contao\TestCase\ContaoTestCase;
-use HeimrichHannot\UtilsBundle\Accordion\AccordionUtil;
-use HeimrichHannot\UtilsBundle\Arrays\ArrayUtil;
-use HeimrichHannot\UtilsBundle\Cache\FileCache;
-use HeimrichHannot\UtilsBundle\Cache\RemoteImageCache;
-use HeimrichHannot\UtilsBundle\Classes\ClassUtil;
-use HeimrichHannot\UtilsBundle\Container\ContainerUtil;
 use HeimrichHannot\UtilsBundle\ContaoManager\Plugin;
-use HeimrichHannot\UtilsBundle\Date\DateUtil;
-use HeimrichHannot\UtilsBundle\Dca\DcaUtil;
-use HeimrichHannot\UtilsBundle\File\FileUtil;
 use HeimrichHannot\UtilsBundle\HeimrichHannotUtilsBundle;
-use HeimrichHannot\UtilsBundle\Image\ImageUtil;
-use HeimrichHannot\UtilsBundle\Model\ModelUtil;
-use HeimrichHannot\UtilsBundle\Module\ModuleUtil;
-use HeimrichHannot\UtilsBundle\Template\TemplateUtil;
-use Symfony\Component\Config\Loader\DelegatingLoader;
-use Symfony\Component\Config\Loader\LoaderResolver;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\HttpKernel\Config\FileLocator;
-use Symfony\Component\HttpKernel\Kernel;
 
 class PluginTest extends ContaoTestCase
 {