diff --git a/evennia/contrib/base_systems/components/component.py b/evennia/contrib/base_systems/components/component.py
index d2ea83fac5..ec07e54e94 100644
--- a/evennia/contrib/base_systems/components/component.py
+++ b/evennia/contrib/base_systems/components/component.py
@@ -50,8 +50,6 @@ class Component(metaclass=BaseComponent):
     name = ""
     slot = None
 
-    cmd_set: CmdSet = None
-
     _fields = {}
 
     def __init__(self, host=None):
@@ -115,11 +113,7 @@ class Component(metaclass=BaseComponent):
             Component: The loaded instance of the component
 
         """
-        inst = cls(host)
-        if inst.cmd_set:
-            host.cmdset.add(inst.cmd_set)
-
-        return inst
+        return cls(host)
 
     def at_added(self, host):
         """
@@ -132,9 +126,6 @@ class Component(metaclass=BaseComponent):
         if self.host and self.host != host:
             raise exceptions.InvalidComponentError("Components must not register twice!")
 
-        if self.cmd_set:
-            self.host.cmdset.add(self.cmd_set)
-
         self.host = host
 
     def at_removed(self, host):
@@ -148,9 +139,6 @@ class Component(metaclass=BaseComponent):
         if host != self.host:
             raise ValueError("Component attempted to remove from the wrong host.")
 
-        if self.cmd_set:
-            self.host.cmdset.remove(self.cmd_set)
-
         self.host = None
 
     @property
diff --git a/evennia/contrib/base_systems/components/holder.py b/evennia/contrib/base_systems/components/holder.py
index 65fb51d22d..55d00f028c 100644
--- a/evennia/contrib/base_systems/components/holder.py
+++ b/evennia/contrib/base_systems/components/holder.py
@@ -118,8 +118,6 @@ class ComponentHandler:
             field.at_removed(component)
 
         component.at_removed(self.host)
-        if component.cmd_set:
-            self.host.cmdset.remove(component.cmd_set)
 
         self.host.tags.remove(component.name, category="components")
         self.host.signals.remove_object_listeners_and_responders(component)