diff --git a/src/Command/Generate/ConfigFormBaseCommand.php b/src/Command/Generate/ConfigFormBaseCommand.php
index 8a01f9896..056538a90 100644
--- a/src/Command/Generate/ConfigFormBaseCommand.php
+++ b/src/Command/Generate/ConfigFormBaseCommand.php
@@ -12,18 +12,18 @@
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Utils\ChainQueue;
 use Drupal\Core\Routing\RouteProviderInterface;
-use Drupal\Console\Command\Shared\ContainerAwareCommandTrait;
 use Drupal\Core\Render\ElementInfoManager;
 
 class ConfigFormBaseCommand extends FormCommand
 {
-
-    use ContainerAwareCommandTrait;
-
-    /** @var Manager  */
+    /**
+     * @var Manager
+     */
     protected $extensionManager;
 
-    /** @var FormGenerator  */
+    /**
+     * @var FormGenerator
+     */
     protected $generator;
 
     /**
@@ -31,7 +31,9 @@ class ConfigFormBaseCommand extends FormCommand
      */
     protected $stringConverter;
 
-    /** @var RouteProviderInterface  */
+    /**
+     * @var RouteProviderInterface
+     */
     protected $routeProvider;
 
     /**
@@ -49,7 +51,6 @@ class ConfigFormBaseCommand extends FormCommand
      */
     protected $chainQueue;
 
-
     /**
      * ConfigFormBaseCommand constructor.
      * @param Manager                $extensionManager
diff --git a/src/Command/Generate/EntityConfigCommand.php b/src/Command/Generate/EntityConfigCommand.php
index 6fe689ced..7c4450b63 100644
--- a/src/Command/Generate/EntityConfigCommand.php
+++ b/src/Command/Generate/EntityConfigCommand.php
@@ -10,23 +10,21 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Command\Generate\EntityCommand;
 use Drupal\Console\Generator\EntityConfigGenerator;
-use Drupal\Console\Command\Shared\CommandTrait;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Utils\Validator;
 use Drupal\Console\Utils\StringConverter;
-use Drupal\Console\Style\DrupalStyle;
 
 class EntityConfigCommand extends EntityCommand
 {
-    use CommandTrait;
-
-    /** @var Manager  */
+    /**
+ * @var Manager  
+*/
     protected $extensionManager;
 
-    /** @var EntityConfigGenerator  */
+    /**
+ * @var EntityConfigGenerator  
+*/
     protected $generator;
 
     /**
@@ -39,7 +37,6 @@ class EntityConfigCommand extends EntityCommand
      */
     protected $stringConverter;
 
-
     /**
      * EntityConfigCommand constructor.
      * @param Manager               $extensionManager
diff --git a/src/Command/Generate/EntityContentCommand.php b/src/Command/Generate/EntityContentCommand.php
index c9ebd35fd..89ef1d956 100644
--- a/src/Command/Generate/EntityContentCommand.php
+++ b/src/Command/Generate/EntityContentCommand.php
@@ -10,10 +10,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Command\Generate\EntityCommand;
 use Drupal\Console\Generator\EntityContentGenerator;
-use Drupal\Console\Command\Shared\CommandTrait;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Utils\StringConverter;
 use Drupal\Console\Utils\ChainQueue;
@@ -22,14 +19,14 @@
 
 class EntityContentCommand extends EntityCommand
 {
-    use CommandTrait;
-
     /**
      * @var ChainQueue
      */
     protected $chainQueue;
 
-    /** @var EntityContentGenerator  */
+    /**
+     * @var EntityContentGenerator
+     */
     protected $generator;
 
     /**
@@ -37,7 +34,9 @@ class EntityContentCommand extends EntityCommand
      */
     protected $stringConverter;
 
-    /** @var Manager  */
+    /**
+     * @var Manager
+     */
     protected $extensionManager;
 
     /**
@@ -45,7 +44,6 @@ class EntityContentCommand extends EntityCommand
      */
     protected $validator;
 
-
     /**
      * EntityContentCommand constructor.
      * @param ChainQueue             $chainQueue
@@ -94,10 +92,10 @@ protected function configure()
         );
 
         $this->addOption(
-          'revisionable',
-          null,
-          InputOption::VALUE_NONE,
-          $this->trans('commands.generate.entity.content.options.revisionable')
+            'revisionable',
+            null,
+            InputOption::VALUE_NONE,
+            $this->trans('commands.generate.entity.content.options.revisionable')
         );
     }
 
@@ -128,8 +126,8 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
         // --revisionable option
         $revisionable = $io->confirm(
-          $this->trans('commands.generate.entity.content.questions.revisionable'),
-          true
+            $this->trans('commands.generate.entity.content.questions.revisionable'),
+            true
         );
         $input->setOption('revisionable', $revisionable);
     }
diff --git a/src/Command/Generate/FormBaseCommand.php b/src/Command/Generate/FormBaseCommand.php
index dbc95a620..9e75348da 100644
--- a/src/Command/Generate/FormBaseCommand.php
+++ b/src/Command/Generate/FormBaseCommand.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Console\Command\Generate;
 
-use Drupal\Console\Command\Generate\FormCommand;
-
 class FormBaseCommand extends FormCommand
 {
     protected function configure()