diff --git a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py
index 3dea9f7..d5cfc0c 100644
--- a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py
+++ b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py
@@ -1,6 +1,6 @@
 
 
-import sopel
+from sopel.trigger import PreTrigger
 
 
 class Commands():
@@ -20,12 +20,9 @@ class Commands():
     def sopel_action_commands(self):
         return self.bot.rules.get_all_action_commands()
 
-    def dispatch(self, bot, trigger, pretriggerdict):
-        # pretriggerdict = {"number": str(number), "message": message}
-        number = pretriggerdict["number"]
-        message = pretriggerdict["message"]
-        pretrigger = sopel.trigger.PreTrigger(
+    def dispatch(self, bot, trigger, message):
+        pretrigger = PreTrigger(
             bot.nick,
-            ":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
+            ":%s %s %s :%s" % (trigger.hostmask, "PRIVMSG", trigger.sender, message)
         )
         bot.dispatch(pretrigger)
diff --git a/sopel_SpiceBot_Runtime_Commands/__init__.py b/sopel_SpiceBot_Runtime_Commands/__init__.py
index b4e9c8d..6c7615a 100644
--- a/sopel_SpiceBot_Runtime_Commands/__init__.py
+++ b/sopel_SpiceBot_Runtime_Commands/__init__.py
@@ -1,7 +1,6 @@
 
 
 from sopel import plugin
-from sopel.trigger import PreTrigger
 
 from sopel_SpiceBot_Core_1 import sb
 
@@ -73,13 +72,4 @@ def commands_test_c(bot, trigger):
 
     bot.say("test c: %s" % trigger.raw)
 
-    # sb.commands.dispatch(bot, trigger, pretriggerdict)
-    dispatch(bot, trigger, ".testa")
-
-
-def dispatch(bot, trigger, message):
-    pretrigger = PreTrigger(
-        bot.nick,
-        ":%s %s %s :%s" % (trigger.hostmask, "PRIVMSG", trigger.sender, message)
-    )
-    bot.dispatch(pretrigger)
+    sb.commands.dispatch(bot, trigger, ".testa")