diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua
index 00ee0439..54950b5a 100644
--- a/config/expcore/roles.lua
+++ b/config/expcore/roles.lua
@@ -154,7 +154,8 @@ Roles.new_role('Supporter','Sup')
     'command/tag-color',
     'command/jail',
     'command/unjail',
-    'command/join-message'
+    'command/join-message',
+    'command/join-message-clear'
 }
 
 Roles.new_role('Partner','Part')
diff --git a/locale/en/data.cfg b/locale/en/data.cfg
index fea0aabe..e98c73da 100644
--- a/locale/en/data.cfg
+++ b/locale/en/data.cfg
@@ -1,6 +1,7 @@
 [join-message]
 greet=[color=0,1,0] Welcome to explosive gaming community server! If you like the server join our discord: __1__ [/color]
 message-set=Your join message has been updated.
+message-cleared=Your join message has been cleared.
 
 [quickbar]
 saved=Your quickbar filters have been saved.
diff --git a/modules/data/greetings.lua b/modules/data/greetings.lua
index 1c885eab..0d2d0393 100644
--- a/modules/data/greetings.lua
+++ b/modules/data/greetings.lua
@@ -33,4 +33,11 @@ Commands.new_command('join-message', 'Sets your custom join message')
     if not player then return end
     CustomMessages:set(player, message)
     return {'join-message.message-set'}
+end)
+
+Commands.new_command('join-message-clear', 'Clear your join message')
+:register(function(player)
+    if not player then return end
+    CustomMessages:remove(player)
+    return {'join-message.message-cleared'}
 end)
\ No newline at end of file
diff --git a/modules/data/quickbar.lua b/modules/data/quickbar.lua
index 8d163866..5d2bbbcd 100644
--- a/modules/data/quickbar.lua
+++ b/modules/data/quickbar.lua
@@ -31,17 +31,29 @@ PlayerFilters:on_load(function(player_name, filters)
     end
 end)
 
+local ignoredItems = {
+    ["blueprint"] = true,
+    ["blueprint-book"] = true,
+    ["deconstruction-planner"] = true,
+    ["spidertron-remote"] = true,
+    ["upgrade-planner"] = true
+}
+
 --- Saves your quickbar preset to the script-output folder
 -- @command save-quickbar
 Commands.new_command('save-quickbar', 'Saves your Quickbar preset items to file')
 :add_alias('save-toolbar')
 :register(function(player)
     local filters = {}
+
     for i = 1, 100 do
         local slot = player.get_quick_bar_slot(i)
         -- Need to filter out blueprint and blueprint books because the slot is a LuaItemPrototype and does not contain a way to export blueprint data
-        if slot ~= nil and slot.name ~= "blueprint" and slot.name ~= "blueprint-book" then
-            filters[i] = slot.name
+        if slot ~= nil then
+            local ignored = ignoredItems[slot.name]
+            if ignored ~= true then
+                filters[i] = slot.name
+            end
         end
     end