diff --git a/src/trait_manager/model/Trait.ts b/src/trait_manager/model/Trait.ts
index 454e18c88..ce47e70de 100644
--- a/src/trait_manager/model/Trait.ts
+++ b/src/trait_manager/model/Trait.ts
@@ -195,11 +195,6 @@ export default class Trait extends Model<TraitProperties> {
     const valueOpts: { avoidStore?: boolean } = {};
     const { setValue } = this.attributes;
 
-    // if (value && typeof value === 'object' && value.type === DataVariableType) {
-    //   value = new TraitDataVariable(value, { em: this.em, trait: this }).initialize();
-    //   this.listenToDataVariable(value);
-    // }
-
     if (setValue) {
       setValue({
         value,