diff --git a/Heimdall.lua b/Heimdall.lua
index 79fdb39..325c637 100644
--- a/Heimdall.lua
+++ b/Heimdall.lua
@@ -30,6 +30,8 @@ local function init()
     ---@field Spotter InitTable
     ---@field DeathReporter InitTable
     ---@field Inviter InitTable
+    ---@field Dueler InitTable
+    ---@field Bully InitTable
 
     --- Config ---
     ---@class HeimdallConfig
@@ -270,6 +272,8 @@ local function init()
     shared.Spotter.Init()
     shared.DeathReporter.Init()
     shared.Inviter.Init()
+    shared.Dueler.Init()
+    shared.Bully.Init()
     print("Heimdall loaded!")
 end
 
diff --git a/Modules/Bully.lua b/Modules/Bully.lua
index e69de29..df54660 100644
--- a/Modules/Bully.lua
+++ b/Modules/Bully.lua
@@ -0,0 +1,9 @@
+local addonname, shared = ...
+---@cast shared HeimdallShared
+---@cast addonname string
+
+---@diagnostic disable-next-line: missing-fields
+shared.Bully = {}
+function shared.Bully.Init()
+	print("Heimdall - Bully loaded")
+end
diff --git a/Modules/DeathReporter.lua b/Modules/DeathReporter.lua
index ada0457..e4ad2b9 100644
--- a/Modules/DeathReporter.lua
+++ b/Modules/DeathReporter.lua
@@ -5,11 +5,6 @@ local addonname, shared = ...
 ---@diagnostic disable-next-line: missing-fields
 shared.DeathReporter = {}
 function shared.DeathReporter.Init()
---	if not Heimdall_Data.config.deathReporter.enabled then
---		print("Heimdall - DeathReporter disabled")
---		return
---	end
-
 	---@type table<string, number>
 	local recentDeaths = {}
 	---@type table<string, number>
diff --git a/Modules/Dueler.lua b/Modules/Dueler.lua
index e69de29..88489e2 100644
--- a/Modules/Dueler.lua
+++ b/Modules/Dueler.lua
@@ -0,0 +1,9 @@
+local addonname, shared = ...
+---@cast shared HeimdallShared
+---@cast addonname string
+
+---@diagnostic disable-next-line: missing-fields
+shared.Dueler = {}
+function shared.Dueler.Init()
+	print("Heimdall - Dueler loaded")
+end
diff --git a/Modules/Inviter.lua b/Modules/Inviter.lua
index 0cff790..17ef409 100644
--- a/Modules/Inviter.lua
+++ b/Modules/Inviter.lua
@@ -5,11 +5,6 @@ local addonname, shared = ...
 ---@diagnostic disable-next-line: missing-fields
 shared.Inviter = {}
 function shared.Inviter.Init()
-	--	if not Heimdall_Data.config.inviter.enabled then
-	--		print("Heimdall - Inviter disabled")
-	--		return
-	--	end
-
 	---@type table<string, boolean>
 	local channelRosterFrame = CreateFrame("Frame")
 	channelRosterFrame:RegisterEvent("CHANNEL_ROSTER_UPDATE")
diff --git a/Modules/Messenger.lua b/Modules/Messenger.lua
index 4aa37ec..480c589 100644
--- a/Modules/Messenger.lua
+++ b/Modules/Messenger.lua
@@ -5,11 +5,6 @@ local addonname, shared = ...
 ---@diagnostic disable-next-line: missing-fields
 shared.Messenger = {}
 function shared.Messenger.Init()
-	--	if not Heimdall_Data.config.messenger.enabled then
-	--		print("Heimdall - Messenger disabled")
-	--		return
-	--	end
-
 	---@class Message
 	---@field message string
 	---@field channel string
diff --git a/Modules/Spotter.lua b/Modules/Spotter.lua
index 0fe88be..d5a756b 100644
--- a/Modules/Spotter.lua
+++ b/Modules/Spotter.lua
@@ -5,11 +5,6 @@ local addonname, shared = ...
 ---@diagnostic disable-next-line: missing-fields
 shared.Spotter = {}
 function shared.Spotter.Init()
---	if not Heimdall_Data.config.spotter.enabled then
---		print("Heimdall - Spotter disabled")
---		return
---	end
-
 	local function FormatHP(hp)
 		if hp > 1e9 then
 			return string.format("%.1fB", hp / 1e9)
diff --git a/Modules/Whoer.lua b/Modules/Whoer.lua
index c222956..b5d07a0 100644
--- a/Modules/Whoer.lua
+++ b/Modules/Whoer.lua
@@ -5,11 +5,6 @@ local addonname, shared = ...
 ---@diagnostic disable-next-line: missing-fields
 shared.Whoer = {}
 function shared.Whoer.Init()
-	--	if not Heimdall_Data.config.who.enabled then
-	--		print("Heimdall - Whoer disabled")
-	--		return
-	--	end
-
 	if not Heimdall_Data.who then Heimdall_Data.who = {} end
 	if not Heimdall_Data.who.data then Heimdall_Data.who.data = {} end