diff --git a/system/actor/hunter-actor-sheet.js b/system/actor/hunter-actor-sheet.js
index 42c0084f..537080f4 100644
--- a/system/actor/hunter-actor-sheet.js
+++ b/system/actor/hunter-actor-sheet.js
@@ -1,7 +1,5 @@
 /* global game, foundry, renderTemplate, ChatMessage, TextEditor, WOD5E, Dialog, WOD5E */
 
-import { WOD5eDice } from '../scripts/system-rolls.js'
-import { getActiveBonuses } from '../scripts/rolls/situational-modifiers.js'
 import { WoDActor } from './wod-v5-sheet.js'
 
 /**
diff --git a/system/actor/scripts/item-roll.js b/system/actor/scripts/item-roll.js
index c5d46904..eb817efa 100644
--- a/system/actor/scripts/item-roll.js
+++ b/system/actor/scripts/item-roll.js
@@ -32,7 +32,7 @@ export const _onRollItem = async function (event) {
   const decreaseRage = false
   const title = item.name
   const flavor = itemData.description
-  const flatMod =  0
+  const flatMod = 0
   const macro = itemData.macroid
   const selectors = []
 
diff --git a/system/scripts/helpers.js b/system/scripts/helpers.js
index f4827570..f40d53ea 100644
--- a/system/scripts/helpers.js
+++ b/system/scripts/helpers.js
@@ -82,7 +82,7 @@ export const loadHelpers = async function () {
   })
 
   // Check whether an object is empty or not
-  Handlebars.registerHelper('isNotEmpty', function(obj) {
+  Handlebars.registerHelper('isNotEmpty', function (obj) {
     return Object.keys(obj).length > 0
   })
 
diff --git a/system/scripts/migration/migrate-abilities-to-attributes.js b/system/scripts/migration/migrate-abilities-to-attributes.js
index 4d8b50f7..74183af6 100644
--- a/system/scripts/migration/migrate-abilities-to-attributes.js
+++ b/system/scripts/migration/migrate-abilities-to-attributes.js
@@ -22,7 +22,7 @@ export const MigrateAbilitiesToAttributes = async function () {
       await actor.update({ 'system.-=abilities': null })
 
       // Update the actor's data with the new attributes information
-      await actor.update({ 'system': actorData })
+      await actor.update({ system: actorData })
 
       // Send a notification and push the actor ID to the migration IDs list
       ui.notifications.info(`Fixing actor ${actor.name}: Migrating abilities data to attributes.`)
diff --git a/system/scripts/migration/migrate-rolldata-to-dicepools.js b/system/scripts/migration/migrate-rolldata-to-dicepools.js
index 70e49ef5..9f8c1cea 100644
--- a/system/scripts/migration/migrate-rolldata-to-dicepools.js
+++ b/system/scripts/migration/migrate-rolldata-to-dicepools.js
@@ -1,4 +1,4 @@
-/* global ui, game, WOD5E */
+/* global ui, game, WOD5E, foundry */
 
 export const MigrateRolldataToDicepools = async function () {
   const actorsList = game.actors
@@ -46,8 +46,11 @@ export const MigrateRolldataToDicepools = async function () {
         }
 
         // Remove unnecessary data
-        const { roll1, roll2, rollable, ...remainingSystem } = updatedItem.system;
-        updatedItem.system = remainingSystem;
+        const { roll1, roll2, rollable, ...remainingSystem } = updatedItem.system
+        roll1 = null
+        roll2 = null
+        rollable = null
+        updatedItem.system = remainingSystem
 
         // Push the updated item to the array
         updatedItems.push(updatedItem)
@@ -69,16 +72,16 @@ export const MigrateRolldataToDicepools = async function () {
 
     const skillsList = WOD5E.Skills.getList({})
     const attributesList = WOD5E.Attributes.getList({})
-    
+
     if (string in skillsList) {
       return `skills.${string}`
     } else if (string in attributesList) {
       return `attributes.${string}`
     } else if (string === 'discipline') {
       if (data.discipline === 'rituals') {
-        return `disciplines.sorcery`
+        return 'disciplines.sorcery'
       } else if (data.discipline === 'ceremonies') {
-        return `disciplines.oblivion`
+        return 'disciplines.oblivion'
       } else {
         return `disciplines.${data.discipline}`
       }