diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index 0489e07328..f870ba56b6 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -101,7 +101,7 @@
     usesApcPower: true
   - type: Wires
     BoardName: "Windoor Control"
-    LayoutId: Windoors
+    LayoutId: Airlock
   - type: UserInterface
     interfaces:
     - key: enum.WiresUiKey.Key
@@ -153,8 +153,6 @@
     - state: panel_open
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       visible: false
-  - type: Wires
-    LayoutId: Secure Windoors
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
index 39a53969db..14b81040a9 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
@@ -20,7 +20,7 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
-    
+
 - type: entity
   parent: Windoor
   id: WindoorBarKitchenLocked
@@ -28,7 +28,7 @@
   components:
   - type: AccessReader
     access: [["Bar"], ["Kitchen"]]
-    
+
 - type: entity
   parent: Windoor
   id: WindoorCargoLocked
@@ -68,7 +68,7 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
-    
+
 - type: entity
   parent: Windoor
   id: WindoorKitchenHydroponicsLocked
@@ -76,7 +76,7 @@
   components:
   - type: AccessReader
     access: [["Kitchen"], ["Hydroponics"]]
-    
+
 - type: entity
   parent: Windoor
   id: WindoorServiceLocked
@@ -84,7 +84,7 @@
   components:
   - type: AccessReader
     access: [["Service"]]
-    
+
 - type: entity
   parent: Windoor
   id: WindoorTheatreLocked
@@ -134,7 +134,7 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
-    
+
 - type: entity
   parent: WindoorSecure
   id: WindoorCommandLocked
@@ -142,8 +142,6 @@
   components:
   - type: AccessReader
     access: [["Command"]]
-  - type: Wires
-    LayoutId: WindoorCommand
 
 - type: entity
   parent: WindoorSecure
@@ -152,7 +150,7 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
-    
+
 - type: entity
   parent: WindoorSecure
   id: WindoorExternalLocked
@@ -200,8 +198,6 @@
   components:
   - type: AccessReader
     access: [["Security"]]
-  - type: Wires
-    LayoutId: WindoorSecurity
 
 - type: entity
   parent: WindoorSecure
@@ -209,4 +205,4 @@
   suffix: Science, Locked
   components:
   - type: AccessReader
-    access: [["Research"]]
\ No newline at end of file
+    access: [["Research"]]
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index 5f4981c6c8..a4eae8c711 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -21,10 +21,6 @@
   parent: Airlock
   id: AirlockArmory
 
-- type: wireLayout
-  parent: Airlock
-  id: Windoors
-
 - type: wireLayout
   id: HighSec
   wires: