diff --git a/src/Generator/Go.php b/src/Generator/Go.php
index 88d79136..3feb7a05 100644
--- a/src/Generator/Go.php
+++ b/src/Generator/Go.php
@@ -24,12 +24,9 @@
 use PSX\Schema\Generator\Type\GeneratorInterface;
 use PSX\Schema\Type\ArrayDefinitionType;
 use PSX\Schema\Type\DefinitionTypeAbstract;
-use PSX\Schema\Type\GenericPropertyType;
 use PSX\Schema\Type\MapDefinitionType;
 use PSX\Schema\Type\ReferencePropertyType;
 use PSX\Schema\Type\StructDefinitionType;
-use PSX\Schema\TypeInterface;
-use PSX\Schema\TypeUtil;
 
 /**
  * Go
diff --git a/src/Generator/Html.php b/src/Generator/Html.php
index 3f7516b0..58eda184 100644
--- a/src/Generator/Html.php
+++ b/src/Generator/Html.php
@@ -22,9 +22,7 @@
 
 use PSX\Schema\Generator\Type\GeneratorInterface;
 use PSX\Schema\Type\ArrayDefinitionType;
-use PSX\Schema\Type\ArrayPropertyType;
 use PSX\Schema\Type\MapDefinitionType;
-use PSX\Schema\Type\ReferencePropertyType;
 use PSX\Schema\Type\StructDefinitionType;
 
 /**
diff --git a/src/Generator/JsonSchema.php b/src/Generator/JsonSchema.php
index 69567faf..852ac173 100644
--- a/src/Generator/JsonSchema.php
+++ b/src/Generator/JsonSchema.php
@@ -25,10 +25,8 @@
 use PSX\Schema\GeneratorInterface;
 use PSX\Schema\SchemaInterface;
 use PSX\Schema\Type\AnyPropertyType;
-use PSX\Schema\Type\ArrayPropertyType;
 use PSX\Schema\Type\ArrayTypeInterface;
 use PSX\Schema\Type\GenericPropertyType;
-use PSX\Schema\Type\MapDefinitionType;
 use PSX\Schema\Type\MapTypeInterface;
 use PSX\Schema\Type\ReferencePropertyType;
 use PSX\Schema\Type\StructDefinitionType;
diff --git a/src/Generator/MarkupAbstract.php b/src/Generator/MarkupAbstract.php
index 2d45b5e5..deecc5fa 100644
--- a/src/Generator/MarkupAbstract.php
+++ b/src/Generator/MarkupAbstract.php
@@ -20,12 +20,6 @@
 
 namespace PSX\Schema\Generator;
 
-use PSX\Schema\Type\ArrayPropertyType;
-use PSX\Schema\Type\NumberPropertyType;
-use PSX\Schema\Type\ScalarPropertyType;
-use PSX\Schema\Type\StringPropertyType;
-use PSX\Schema\TypeInterface;
-
 /**
  * MarkupAbstract
  *
diff --git a/src/Generator/Php.php b/src/Generator/Php.php
index 54fb526d..c4053762 100644
--- a/src/Generator/Php.php
+++ b/src/Generator/Php.php
@@ -30,21 +30,14 @@
 use PSX\Record\Record;
 use PSX\Record\RecordableInterface;
 use PSX\Record\RecordInterface;
-use PSX\Schema\Format;
 use PSX\Schema\Generator\Normalizer\NormalizerInterface;
 use PSX\Schema\Generator\Type\GeneratorInterface;
 use PSX\Schema\Type\ArrayDefinitionType;
-use PSX\Schema\Type\ArrayPropertyType;
 use PSX\Schema\Type\DefinitionTypeAbstract;
 use PSX\Schema\Type\MapDefinitionType;
-use PSX\Schema\Type\NumberPropertyType;
-use PSX\Schema\Type\ReferencePropertyType;
-use PSX\Schema\Type\ScalarPropertyType;
-use PSX\Schema\Type\StringPropertyType;
-use PSX\Schema\Type\StructDefinitionType;
 use PSX\Schema\Type\PropertyTypeAbstract;
+use PSX\Schema\Type\StructDefinitionType;
 use PSX\Schema\Type\UnionType;
-use PSX\Schema\TypeInterface;
 
 /**
  * Php
diff --git a/src/Generator/Python.php b/src/Generator/Python.php
index 08c360bb..0b26af6f 100644
--- a/src/Generator/Python.php
+++ b/src/Generator/Python.php
@@ -26,11 +26,8 @@
 use PSX\Schema\Type\ArrayDefinitionType;
 use PSX\Schema\Type\DefinitionTypeAbstract;
 use PSX\Schema\Type\MapDefinitionType;
-use PSX\Schema\Type\ReferencePropertyType;
 use PSX\Schema\Type\StringPropertyType;
 use PSX\Schema\Type\StructDefinitionType;
-use PSX\Schema\Type\PropertyTypeAbstract;
-use PSX\Schema\TypeInterface;
 use PSX\Schema\TypeUtil;
 
 /**
diff --git a/src/Generator/Rust.php b/src/Generator/Rust.php
index 83fc362f..52877c96 100644
--- a/src/Generator/Rust.php
+++ b/src/Generator/Rust.php
@@ -26,11 +26,8 @@
 use PSX\Schema\Type\ArrayDefinitionType;
 use PSX\Schema\Type\DefinitionTypeAbstract;
 use PSX\Schema\Type\MapDefinitionType;
-use PSX\Schema\Type\ReferencePropertyType;
 use PSX\Schema\Type\StringPropertyType;
 use PSX\Schema\Type\StructDefinitionType;
-use PSX\Schema\Type\PropertyTypeAbstract;
-use PSX\Schema\TypeInterface;
 use PSX\Schema\TypeUtil;
 
 /**
diff --git a/src/Generator/Swift.php b/src/Generator/Swift.php
index 5a2acdff..8ed4663a 100644
--- a/src/Generator/Swift.php
+++ b/src/Generator/Swift.php
@@ -25,7 +25,6 @@
 use PSX\Schema\Type\ArrayDefinitionType;
 use PSX\Schema\Type\DefinitionTypeAbstract;
 use PSX\Schema\Type\MapDefinitionType;
-use PSX\Schema\Type\PropertyTypeAbstract;
 use PSX\Schema\Type\StructDefinitionType;
 
 /**
diff --git a/src/Generator/Type/GeneratorInterface.php b/src/Generator/Type/GeneratorInterface.php
index f436288e..0e960b8d 100644
--- a/src/Generator/Type/GeneratorInterface.php
+++ b/src/Generator/Type/GeneratorInterface.php
@@ -22,7 +22,6 @@
 
 use PSX\Schema\ContentType;
 use PSX\Schema\Type\PropertyTypeAbstract;
-use PSX\Schema\TypeInterface;
 
 /**
  * A generator can implement this interface if it has the ability to resolve a type from a schema instance. It returns
diff --git a/src/Generator/Type/Go.php b/src/Generator/Type/Go.php
index 47ed8870..aa335c1d 100644
--- a/src/Generator/Type/Go.php
+++ b/src/Generator/Type/Go.php
@@ -21,7 +21,6 @@
 namespace PSX\Schema\Generator\Type;
 
 use PSX\Schema\ContentType;
-use PSX\Schema\Format;
 
 /**
  * Go
diff --git a/src/Generator/Type/Php.php b/src/Generator/Type/Php.php
index e431b80b..5773cc98 100644
--- a/src/Generator/Type/Php.php
+++ b/src/Generator/Type/Php.php
@@ -29,12 +29,9 @@
 use PSX\Schema\Format;
 use PSX\Schema\Type\ArrayPropertyType;
 use PSX\Schema\Type\GenericPropertyType;
-use PSX\Schema\Type\MapDefinitionType;
 use PSX\Schema\Type\MapPropertyType;
 use PSX\Schema\Type\PropertyTypeAbstract;
 use PSX\Schema\Type\ReferencePropertyType;
-use PSX\Schema\Type\StringPropertyType;
-use PSX\Schema\TypeInterface;
 
 /**
  * Php
diff --git a/src/Generator/TypeScript.php b/src/Generator/TypeScript.php
index 2464d5d1..75d801bb 100644
--- a/src/Generator/TypeScript.php
+++ b/src/Generator/TypeScript.php
@@ -27,9 +27,7 @@
 use PSX\Schema\Type\ArrayDefinitionType;
 use PSX\Schema\Type\DefinitionTypeAbstract;
 use PSX\Schema\Type\MapDefinitionType;
-use PSX\Schema\Type\ReferencePropertyType;
 use PSX\Schema\Type\StructDefinitionType;
-use PSX\Schema\TypeInterface;
 use PSX\Schema\TypeUtil;
 
 /**