diff --git a/Content.Server/Strip/StrippableComponent.cs b/Content.Server/Strip/StrippableComponent.cs
index a3f0bb6862..8cf8acc606 100644
--- a/Content.Server/Strip/StrippableComponent.cs
+++ b/Content.Server/Strip/StrippableComponent.cs
@@ -47,8 +47,8 @@ namespace Content.Server.Strip
 
             _strippableSystem = EntitySystem.Get<StrippableSystem>();
             Owner.EnsureComponentWarn<ServerInventoryComponent>();
-            if(_entities.TryGetComponent<CuffableComponent>(Owner, out var cuffed))
-                cuffed.OnCuffedStateChanged += UpdateState;
+            var cuffed = Owner.EnsureComponentWarn<CuffableComponent>();
+            cuffed.OnCuffedStateChanged += UpdateState;
         }
 
         protected override void Shutdown()
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index 8d783e471c..f94fa247da 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -64,13 +64,6 @@
       - id: PowerDrill
       - id: JawsOfLife
       - id: WelderExperimental
-  - type: Inventory
-    templateId: drone
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-    - key: enum.StrippingUiKey.Key
-      type: StrippableBoundUserInterface
   - type: GhostTakeoverAvailable
     makeSentient: true
     name: Maintenance Drone
@@ -93,9 +86,6 @@
     layers:
     - state: shell
       sprite: Mobs/Silicon/drone.rsi
-    - map: [ "head" ]
-      offset: 0, -0.45
-      rotateOffset: false
   - type: Fixtures
     fixtures:
     - shape:
diff --git a/Resources/Prototypes/InventoryTemplates/drone_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/drone_inventory_template.yml
deleted file mode 100644
index 94959bb94a..0000000000
--- a/Resources/Prototypes/InventoryTemplates/drone_inventory_template.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: inventoryTemplate
-  id: drone
-  slots:
-  - name: head
-    slotTexture: head
-    slotFlags: HEAD
-    uiContainer: BottomLeft
-    uiWindowPos: 0,0
-    displayName: Head