diff --git a/core/lib/Drupal/Core/Access/AccessManager.php b/core/lib/Drupal/Core/Access/AccessManager.php
index 3bb219f..7b1b914 100644
--- a/core/lib/Drupal/Core/Access/AccessManager.php
+++ b/core/lib/Drupal/Core/Access/AccessManager.php
@@ -28,7 +28,6 @@
  * @see \Drupal\Tests\Core\Access\AccessManagerTest
  */
 class AccessManager implements ContainerAwareInterface {
-
   use ContainerAwareTrait;
 
   /**
diff --git a/core/lib/Drupal/Core/Cache/CacheFactory.php b/core/lib/Drupal/Core/Cache/CacheFactory.php
index b6a6f1e..797b54b 100644
--- a/core/lib/Drupal/Core/Cache/CacheFactory.php
+++ b/core/lib/Drupal/Core/Cache/CacheFactory.php
@@ -16,7 +16,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class CacheFactory implements CacheFactoryInterface,  ContainerAwareInterface {
-
   use ContainerAwareTrait;
 
   /**
diff --git a/core/lib/Drupal/Core/Controller/AjaxController.php b/core/lib/Drupal/Core/Controller/AjaxController.php
index c63360c..15562a9 100644
--- a/core/lib/Drupal/Core/Controller/AjaxController.php
+++ b/core/lib/Drupal/Core/Controller/AjaxController.php
@@ -16,7 +16,6 @@
  * Default controller for Ajax requests.
  */
 class AjaxController implements ContainerAwareInterface {
-
   use ContainerAwareTrait;
 
   /**
diff --git a/core/lib/Drupal/Core/Controller/ControllerResolver.php b/core/lib/Drupal/Core/Controller/ControllerResolver.php
index c37ed83..902852c 100644
--- a/core/lib/Drupal/Core/Controller/ControllerResolver.php
+++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php
@@ -29,7 +29,6 @@
  *    convention).
  */
 class ControllerResolver extends BaseControllerResolver implements ControllerResolverInterface, ContainerAwareInterface {
-
    use ContainerAwareTrait;
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 0082a13..319a464 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -42,7 +42,6 @@
  * @see hook_entity_type_alter()
  */
 class EntityManager extends PluginManagerBase implements EntityManagerInterface, ContainerAwareInterface  {
-
   use ContainerAwareTrait;
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryFactory.php b/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
index f435707..ab8a7e4 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
@@ -15,7 +15,6 @@
  * Factory class Creating entity query objects.
  */
 class QueryFactory implements ContainerAwareInterface {
-
   use ContainerAwareTrait;
 
   /**
diff --git a/core/lib/Drupal/Core/EventSubscriber/ContentFormControllerSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ContentFormControllerSubscriber.php
index b64e6a4..eae3528 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ContentFormControllerSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ContentFormControllerSubscriber.php
@@ -20,7 +20,6 @@
  * Subscriber for setting wrapping form logic.
  */
 class ContentFormControllerSubscriber implements EventSubscriberInterface, ContainerAwareInterface {
-
   use ContainerAwareTrait;
 
   /**
diff --git a/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php
index 7cedb1c..f5e2541 100644
--- a/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php
@@ -16,7 +16,6 @@
  * Destructs services that are initiated and tagged with "needs_destruction".
  */
 class KernelDestructionSubscriber implements EventSubscriberInterface, ContainerAwareInterface {
-
   use ContainerAwareTrait;
   /**
    * Holds an array of service ID's that will require destruction.
diff --git a/core/lib/Drupal/Core/HttpKernel.php b/core/lib/Drupal/Core/HttpKernel.php
index dba6032..a9f3e98 100644
--- a/core/lib/Drupal/Core/HttpKernel.php
+++ b/core/lib/Drupal/Core/HttpKernel.php
@@ -28,7 +28,6 @@
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
 class HttpKernel extends BaseHttpKernel implements ContainerAwareInterface {
-
     use ContainerAwareTrait;
 
     private $esiSupport;
diff --git a/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php b/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
index e93e8cb..62ab953 100644
--- a/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
+++ b/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
@@ -20,7 +20,6 @@
  * node entity.
  */
 class ParamConverterManager implements ParamConverterManagerInterface, ContainerAwareInterface {
-
   use ContainerAwareTrait;
 
   /**
diff --git a/core/lib/Drupal/Core/Queue/QueueFactory.php b/core/lib/Drupal/Core/Queue/QueueFactory.php
index 93ffebb..fc03767 100644
--- a/core/lib/Drupal/Core/Queue/QueueFactory.php
+++ b/core/lib/Drupal/Core/Queue/QueueFactory.php
@@ -15,7 +15,6 @@
  * Defines the queue factory.
  */
 class QueueFactory implements ContainerAwareInterface {
-
   use ContainerAwareTrait;
 
   /**
diff --git a/core/modules/contextual/lib/Drupal/contextual/ContextualController.php b/core/modules/contextual/lib/Drupal/contextual/ContextualController.php
index aeee4a6..9f28fc8 100644
--- a/core/modules/contextual/lib/Drupal/contextual/ContextualController.php
+++ b/core/modules/contextual/lib/Drupal/contextual/ContextualController.php
@@ -18,7 +18,6 @@
  * Returns responses for Contextual module routes.
  */
 class ContextualController implements ContainerAwareInterface {
-
   use ContainerAwareTrait;
 
   /**
diff --git a/core/modules/rest/lib/Drupal/rest/RequestHandler.php b/core/modules/rest/lib/Drupal/rest/RequestHandler.php
index 20aaf5d..07742e8 100644
--- a/core/modules/rest/lib/Drupal/rest/RequestHandler.php
+++ b/core/modules/rest/lib/Drupal/rest/RequestHandler.php
@@ -20,7 +20,6 @@
  * Acts as intermediate request forwarder for resource plugins.
  */
 class RequestHandler implements ContainerAwareInterface {
-
   use ContainerAwareTrait;
 
   /**