diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index 7ddd878c..7dd7993c 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -317,7 +317,7 @@ export default class DhCharacter extends BaseDataActor {
     }
 
     get multiclass() {
-        const value = this.parent.items.find(x => x.type === 'class' && x.system.isMulticlass);
+        const value = this.parent.items.find(x => x.type === 'Class' && x.system.isMulticlass);
         const subclass = this.parent.items.find(x => x.type === 'subclass' && x.system.isMulticlass);
 
         return {
@@ -443,8 +443,7 @@ export default class DhCharacter extends BaseDataActor {
                 classFeatures.push(item);
             } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.subclass.id) {
                 if (this.class.subclass) {
-                    const prop = item.system.multiclassOrigin ? 'multiclass' : 'class';
-                    const subclassState = this[prop].subclass.system.featureState;
+                    const subclassState = this.class.subclass.system.featureState;
 
                     if (
                         item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.foundation ||
diff --git a/module/data/item/base.mjs b/module/data/item/base.mjs
index f8eae265..f333537b 100644
--- a/module/data/item/base.mjs
+++ b/module/data/item/base.mjs
@@ -148,6 +148,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
             for (let f of this.features) {
                 const fBase = f.item ?? f;
                 const feature = fBase.system ? fBase : await foundry.utils.fromUuid(fBase.uuid);
+                const multiclass = this.isMulticlass ? 'multiclass' : null;
                 features.push(
                     foundry.utils.mergeObject(
                         feature.toObject(),
@@ -155,8 +156,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
                             _stats: { compendiumSource: fBase.uuid },
                             system: {
                                 originItemType: this.parent.type,
-                                identifier: f.item ? f.type : null,
-                                multiclassOrigin: this.isMulticlass
+                                identifier: multiclass ?? (f.item ? f.type : null)
                             }
                         },
                         { inplace: false }
diff --git a/module/data/item/class.mjs b/module/data/item/class.mjs
index 157f70c5..5e92d2fc 100644
--- a/module/data/item/class.mjs
+++ b/module/data/item/class.mjs
@@ -102,6 +102,15 @@ export default class DHClass extends BaseDataItem {
         if (allowed === false) return;
     }
 
+    _onDelete(options, userId) {
+        super._onDelete(options, userId);
+
+        if (options.parent?.type === 'character') {
+            const path = `system.${this.isMulticlass ? 'multiclass' : 'class'}`;
+            foundry.utils.getProperty(options.parent, `${path}.subclass`)?.delete();
+        }
+    }
+
     async _preUpdate(changed, options, userId) {
         const allowed = await super._preUpdate(changed, options, userId);
         if (allowed === false) return false;
diff --git a/module/data/item/feature.mjs b/module/data/item/feature.mjs
index 3b8fe064..6e1aab41 100644
--- a/module/data/item/feature.mjs
+++ b/module/data/item/feature.mjs
@@ -29,7 +29,6 @@ export default class DHFeature extends BaseDataItem {
                 nullable: true,
                 initial: null
             }),
-            multiclassOrigin: new fields.BooleanField({ initial: false }),
             identifier: new fields.StringField()
         };
     }
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 3325547c..e1dd93af 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -164,10 +164,10 @@ export default class DhpActor extends Actor {
                 if (multiclass) {
                     const multiclassItem = this.items.find(x => x.uuid === multiclass.itemUuid);
                     const multiclassFeatures = this.items.filter(
-                        x => x.system.originItemType === 'class' && x.system.multiclassOrigin
+                        x => x.system.originItemType === 'class' && x.system.identifier === 'multiclass'
                     );
                     const subclassFeatures = this.items.filter(
-                        x => x.system.originItemType === 'subclass' && x.system.multiclassOrigin
+                        x => x.system.originItemType === 'subclass' && x.system.identifier === 'multiclass'
                     );
 
                     this.deleteEmbeddedDocuments(