diff --git a/src/Api/ApigeeX/Entity/ApiProduct.php b/src/Api/ApigeeX/Entity/ApiProduct.php
index 3a9f36cb..e403298f 100755
--- a/src/Api/ApigeeX/Entity/ApiProduct.php
+++ b/src/Api/ApigeeX/Entity/ApiProduct.php
@@ -19,7 +19,6 @@
 namespace Apigee\Edge\Api\ApigeeX\Entity;
 
 use Apigee\Edge\Api\Monetization\Entity\Entity;
-use Apigee\Edge\Entity\Property\AttributesPropertyAwareTrait;
 use Apigee\Edge\Entity\Property\DescriptionPropertyAwareTrait;
 use Apigee\Edge\Entity\Property\DisplayNamePropertyAwareTrait;
 use Apigee\Edge\Entity\Property\EnvironmentsPropertyAwareTrait;
@@ -27,7 +26,6 @@
 
 class ApiProduct extends Entity implements ApiProductInterface
 {
-    use AttributesPropertyAwareTrait;
     use DescriptionPropertyAwareTrait;
     use DisplayNamePropertyAwareTrait;
     use EnvironmentsPropertyAwareTrait;
diff --git a/src/Api/ApigeeX/Entity/ApiProductInterface.php b/src/Api/ApigeeX/Entity/ApiProductInterface.php
index 819d4519..fa5e23e2 100755
--- a/src/Api/ApigeeX/Entity/ApiProductInterface.php
+++ b/src/Api/ApigeeX/Entity/ApiProductInterface.php
@@ -18,14 +18,12 @@
 
 namespace Apigee\Edge\Api\ApigeeX\Entity;
 
-use Apigee\Edge\Entity\Property\AttributesPropertyInterface;
 use Apigee\Edge\Entity\Property\DescriptionPropertyInterface;
 use Apigee\Edge\Entity\Property\DisplayNamePropertyInterface;
 use Apigee\Edge\Entity\Property\EnvironmentsPropertyInterface;
 use Apigee\Edge\Entity\Property\NamePropertyInterface;
 
 interface ApiProductInterface extends
-    AttributesPropertyInterface,
     DescriptionPropertyInterface,
     DisplayNamePropertyInterface,
     EnvironmentsPropertyInterface,
diff --git a/src/Entity/Property/AttributesPropertyAwareTrait.php b/src/Entity/Property/AttributesPropertyAwareTrait.php
index 5b29ee8b..e7f8214e 100644
--- a/src/Entity/Property/AttributesPropertyAwareTrait.php
+++ b/src/Entity/Property/AttributesPropertyAwareTrait.php
@@ -33,7 +33,7 @@ trait AttributesPropertyAwareTrait
     /**
      * {@inheritdoc}
      */
-    public function getAttributes(): ?AttributesProperty
+    public function getAttributes(): AttributesProperty
     {
         return $this->attributes;
     }
diff --git a/src/Entity/Property/AttributesPropertyInterface.php b/src/Entity/Property/AttributesPropertyInterface.php
index 7191aac9..67f5d121 100644
--- a/src/Entity/Property/AttributesPropertyInterface.php
+++ b/src/Entity/Property/AttributesPropertyInterface.php
@@ -30,7 +30,7 @@ interface AttributesPropertyInterface
     /**
      * @return \Apigee\Edge\Structure\AttributesProperty
      */
-    public function getAttributes(): ?AttributesProperty;
+    public function getAttributes(): AttributesProperty;
 
     /**
      * @param \Apigee\Edge\Structure\AttributesProperty $attributes