diff --git a/src/ETL/Extract/DataJson.php b/src/ETL/Extract/DataJson.php
index 4cc268a..3134e43 100644
--- a/src/ETL/Extract/DataJson.php
+++ b/src/ETL/Extract/DataJson.php
@@ -3,6 +3,7 @@
 namespace Harvest\ETL\Extract;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface;
 use Harvest\Util;
 
 class DataJson extends Extract
@@ -17,11 +18,11 @@ class DataJson extends Extract
     /**
      * Inject the guzzle client.
      *
-     * @var \GuzzleHttp\Client
+     * @var \GuzzleHttp\ClientInterface
      */
     protected $client;
 
-    public function __construct(object $harvest_plan, Client $client = null)
+    public function __construct(object $harvest_plan, ClientInterface $client = null)
     {
         $this->client = $client ?? new Client();
         $this->harvest_plan = $harvest_plan;
diff --git a/src/ETL/Factory.php b/src/ETL/Factory.php
index 3393228..fa7b3b9 100644
--- a/src/ETL/Factory.php
+++ b/src/ETL/Factory.php
@@ -2,10 +2,7 @@
 
 namespace Harvest\ETL;
 
-use Harvest\Storage\StorageInterface;
 use Opis\JsonSchema\Validator;
-use Opis\JsonSchema\ValidationResult;
-use Opis\JsonSchema\ValidationError;
 use Opis\JsonSchema\Schema;
 
 class Factory