diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index 484c821c..34a1f525 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -523,14 +523,7 @@ export default class DhCharacter extends BaseDataActor {
         return {
             ...data,
             tier: this.tier,
-            level: this.levelData.level.current,
-            system: {
-                token: this.resources.tokens,
-                dice: this.resources.dice,
-                bonuses: this.bonuses,
-                rules: this.rules,
-                levelData: this.levelData
-            }
+            level: this.levelData.level.current
         };
     }
 
diff --git a/module/documents/token.mjs b/module/documents/token.mjs
index 34be55c9..a8105eb2 100644
--- a/module/documents/token.mjs
+++ b/module/documents/token.mjs
@@ -16,7 +16,21 @@ export default class DHToken extends TokenDocument {
         });
         bars.sort((a, b) => a.label.compare(b.label));
 
-        const invalidAttributes = ['gold', 'levelData', 'actions'];
+        const invalidAttributes = [
+            'gold',
+            'levelData',
+            'actions',
+            'biography',
+            'class',
+            'multiclass',
+            'companion',
+            'notes',
+            'partner',
+            'description',
+            'impulses',
+            'tier',
+            'type'
+        ];
         const values = attributes.value.reduce((acc, v) => {
             const a = v.join('.');
             if (invalidAttributes.some(x => a.startsWith(x))) return acc;