diff --git a/src/BaseFactory.php b/src/BaseFactory.php
index a36f137..627afad 100644
--- a/src/BaseFactory.php
+++ b/src/BaseFactory.php
@@ -9,7 +9,7 @@
 use Throwable;
 use UnexpectedValueException;
 
-abstract class BaseFactory
+abstract class BaseFactory implements HandlerInterface
 {
     public const RETURN_TYPE = HandlerInterface::class;
 
diff --git a/src/Factories/FactoryFactory.php b/src/Factories/FactoryFactory.php
index c0e5194..9379ce3 100644
--- a/src/Factories/FactoryFactory.php
+++ b/src/Factories/FactoryFactory.php
@@ -3,7 +3,6 @@
 namespace Tatter\Handlers\Factories;
 
 use Tatter\Handlers\BaseFactory;
-use Tatter\Handlers\Interfaces\HandlerInterface;
 
 /**
  * Factory Factory Class
@@ -11,20 +10,13 @@
  * Used to discover other Factory classes
  * which are set up as handlers themselves.
  */
-class FactoryFactory extends BaseFactory implements HandlerInterface
+class FactoryFactory extends BaseFactory
 {
-    /**
-     * Use Factories-style class basenames to
-     * guesstimate a good handlerId.
-     */
     public static function handlerId(): string
     {
         return 'factory';
     }
 
-    /**
-     * Returns the search path.
-     */
     public function getPath(): string
     {
         return 'Factories';
diff --git a/tests/_support/Factories/CarFactory.php b/tests/_support/Factories/CarFactory.php
index 7f43ca6..3bdcc77 100644
--- a/tests/_support/Factories/CarFactory.php
+++ b/tests/_support/Factories/CarFactory.php
@@ -3,9 +3,8 @@
 namespace Tests\Support\Factories;
 
 use Tatter\Handlers\BaseFactory;
-use Tatter\Handlers\Interfaces\HandlerInterface;
 
-class CarFactory extends BaseFactory implements HandlerInterface
+class CarFactory extends BaseFactory
 {
     /**
      * Returns the search path.