diff --git a/sopel_modules/SpiceBot_AI/AI_Acknowledge b/sopel_modules/SpiceBot_AI/AI_Acknowledge
deleted file mode 100644
index 50b1796..0000000
--- a/sopel_modules/SpiceBot_AI/AI_Acknowledge
+++ /dev/null
@@ -1,15 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-
-@sopel.module.rule('$nickname!')
-def exclaim(bot, trigger):
-    bot.osd(trigger.nick + '!')
-
-
-@sopel.module.rule('$nickname\?')
-def imhere(bot, trigger):
-    bot.osd("I'm here, " + trigger.nick)
diff --git a/sopel_modules/SpiceBot_AI/AI_Gender b/sopel_modules/SpiceBot_AI/AI_Gender
deleted file mode 100644
index a2a8f5f..0000000
--- a/sopel_modules/SpiceBot_AI/AI_Gender
+++ /dev/null
@@ -1,10 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-
-@sopel.module.nickname_commands('gender')
-def bot_command_gender(bot, trigger):
-    bot.osd("If societal genders are binary, my gender is female")
diff --git a/sopel_modules/SpiceBot_AI/AI_Ping.py b/sopel_modules/SpiceBot_AI/AI_Ping.py
deleted file mode 100644
index 76b6ee4..0000000
--- a/sopel_modules/SpiceBot_AI/AI_Ping.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-
-@sopel.module.rule(r'(?i)(ping),? $nickname[ \t]*$')
-def bot_command_ping(bot, trigger):
-    bot.osd("Pong")
-
-
-@sopel.module.nickname_commands('ping')
-def bot_command_ping_b(bot, trigger):
-    bot_command_ping(bot, trigger)
diff --git a/sopel_modules/SpiceBot_AI/__init__.py b/sopel_modules/SpiceBot_AI/__init__.py
index 18c6220..22654e1 100644
--- a/sopel_modules/SpiceBot_AI/__init__.py
+++ b/sopel_modules/SpiceBot_AI/__init__.py
@@ -6,14 +6,11 @@ from .AI_aiml import *
 from .AI_Hello import *
 from .AI_Goodbye import *
 from .AI_Thanks import *
-#from .AI_Acknowledge import *
 from .AI_Lazy import *
 from .AI_InsultHandler import *
-from .AI_Ping import *
 from .AI_Love import *
 from .AI_Really import *
 from .AI_Welcomeback import *
-# from .AI_Gender import *
 
 __author__ = 'Sam Zick'
 __email__ = 'sam@deathbybandaid.net'
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_goodbye.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_goodbye.aiml
new file mode 100644
index 0000000..6234ef0
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_goodbye.aiml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aiml version="1.0">
+
+<category>
+  <pattern>BOTNICK BYE</pattern>
+      <template>
+        <random>
+          <li>bye, triggernick</li>
+          <li>goodbye, triggernick</li>
+          <li>seeya, triggernick</li>
+          <li>cya, triggernick</li>
+          <li>ttyl, triggernick</li>
+        </random>
+      </template>
+</category>
+
+<category>
+  <pattern>BOTNICK GOODBYE</pattern>
+      <template>
+        <random>
+          <li>bye, triggernick</li>
+          <li>goodbye, triggernick</li>
+          <li>seeya, triggernick</li>
+          <li>cya, triggernick</li>
+          <li>ttyl, triggernick</li>
+        </random>
+      </template>
+</category>
+
+<category>
+  <pattern>BYE BOTNICK</pattern>
+      <template>
+        <random>
+          <li>bye, triggernick</li>
+          <li>goodbye, triggernick</li>
+          <li>seeya, triggernick</li>
+          <li>cya, triggernick</li>
+          <li>ttyl, triggernick</li>
+        </random>
+      </template>
+</category>
+
+<category>
+  <pattern>GOODBYE BOTNICK</pattern>
+      <template>
+        <random>
+          <li>bye, triggernick</li>
+          <li>goodbye, triggernick</li>
+          <li>seeya, triggernick</li>
+          <li>cya, triggernick</li>
+          <li>ttyl, triggernick</li>
+        </random>
+      </template>
+</category>
+
+</aiml>
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_ping.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_ping.aiml
new file mode 100644
index 0000000..f6a0b7a
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_ping.aiml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aiml version="1.0">
+
+<category>
+  <pattern>BOTNICK PING</pattern>
+  <template>pong</template>
+</category>
+
+</aiml>