diff --git a/common/combat/damage.packet.js b/common/combat/damage.packet.js
index f1f7b8b..580cb3f 100644
--- a/common/combat/damage.packet.js
+++ b/common/combat/damage.packet.js
@@ -1,20 +1,18 @@
-import {EntityPacket} from '@avocado/entity';
+// export class DamagePacket extends EntityPacket {
 
-export class DamagePacket extends EntityPacket {
+//   static get schema() {
+//     const schema = super.schema;
+//     schema.data.damages = [
+//       {
+//         amount: 'varuint',
+//         damageSpec: {
+//           affinity: 'uint8',
+//         },
+//         from: 'uint32',
+//         isDamage: 'bool',
+//       },
+//     ];
+//     return schema;
+//   }
 
-  static get schema() {
-    const schema = super.schema;
-    schema.data.damages = [
-      {
-        amount: 'varuint',
-        damageSpec: {
-          affinity: 'uint8',
-        },
-        from: 'uint32',
-        isDamage: 'bool',
-      },
-    ];
-    return schema;
-  }
-
-}
+// }
diff --git a/common/traits/trait-item-qty.packet.js b/common/traits/trait-item-qty.packet.js
index 6ae0608..f035adf 100644
--- a/common/traits/trait-item-qty.packet.js
+++ b/common/traits/trait-item-qty.packet.js
@@ -1,12 +1,10 @@
-import {EntityPacket} from '@avocado/entity';
+// export class TraitItemQtyPacket extends EntityPacket {
 
-export class TraitItemQtyPacket extends EntityPacket {
+//   static get schema() {
+//     const schema = super.schema;
+//     schema.data.slotIndex = 'uint16';
+//     schema.data.qty = 'uint16';
+//     return schema;
+//   }
 
-  static get schema() {
-    const schema = super.schema;
-    schema.data.slotIndex = 'uint16';
-    schema.data.qty = 'uint16';
-    return schema;
-  }
-
-}
+// }
diff --git a/common/traits/trait-item-swap.packet.js b/common/traits/trait-item-swap.packet.js
index 6ab8ded..fabe33e 100644
--- a/common/traits/trait-item-swap.packet.js
+++ b/common/traits/trait-item-swap.packet.js
@@ -1,12 +1,10 @@
-import {EntityPacket} from '@avocado/entity';
+// export class TraitItemSwapPacket extends EntityPacket {
 
-export class TraitItemSwapPacket extends EntityPacket {
+//   static get schema() {
+//     const schema = super.schema;
+//     schema.data.firstSlotIndex = 'uint16';
+//     schema.data.secondSlotIndex = 'uint16';
+//     return schema;
+//   }
 
-  static get schema() {
-    const schema = super.schema;
-    schema.data.firstSlotIndex = 'uint16';
-    schema.data.secondSlotIndex = 'uint16';
-    return schema;
-  }
-
-}
+// }
diff --git a/common/traits/trait-plant.packet.js b/common/traits/trait-plant.packet.js
index e539c6a..cb46217 100644
--- a/common/traits/trait-plant.packet.js
+++ b/common/traits/trait-plant.packet.js
@@ -1,11 +1,9 @@
-import {EntityPacket} from '@avocado/entity';
+// export class TraitPlantPacket extends EntityPacket {
 
-export class TraitPlantPacket extends EntityPacket {
+//   static get schema() {
+//     const schema = super.schema;
+//     schema.data.growthStage = 'uint8';
+//     return schema;
+//   }
 
-  static get schema() {
-    const schema = super.schema;
-    schema.data.growthStage = 'uint8';
-    return schema;
-  }
-
-}
+// }
diff --git a/server/traits/informed.trait.js b/server/traits/informed.trait.js
index f635d26..83bc9d2 100644
--- a/server/traits/informed.trait.js
+++ b/server/traits/informed.trait.js
@@ -4,7 +4,7 @@ import * as I from 'immutable';
 import immutablediff from 'immutablediff';
 
 import {compose} from '@avocado/core';
-import {EntityCreatePacket, EntityPacket, EntityRemovePacket, Trait} from '@avocado/entity';
+import {Trait} from '@avocado/entity';
 import {Rectangle, Vector} from '@avocado/math';
 import {BundlePacket, ServerSynchronizer} from '@avocado/net';