diff --git a/src/Generator/Schema.php b/src/Generator/Schema.php
index 14a8978..840b93a 100644
--- a/src/Generator/Schema.php
+++ b/src/Generator/Schema.php
@@ -37,17 +37,6 @@ public static function generate(string $name, string $namespace, string $classNa
                 Class_::MODIFIER_PUBLIC
             )
         )->addStmt(
-            new Node\Stmt\ClassConst(
-                [
-                    new Node\Const_(
-                        'SPL_HASH',
-                        new Node\Scalar\String_(
-                            spl_object_hash($schema)
-                        )
-                    ),
-                ],
-                Class_::MODIFIER_PUBLIC
-        ))->addStmt(
             new Node\Stmt\ClassConst(
                 [
                     new Node\Const_(
@@ -62,6 +51,7 @@ public static function generate(string $name, string $namespace, string $classNa
         );
 
         foreach ($schema->properties as $propertyName => $property) {
+            $propertyName = trim($propertyName, '@');
             $propertyStmt = $factory->property($propertyName)->makePrivate();
             $docBlock = [];
             if (strlen($property->description) > 0) {