diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
index fe64df7a12..d8c50211cc 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -151,7 +151,6 @@
 - type: entity
   id: AirAlarmXeno
   parent: AirAlarm
-  name: air alarm
   description: An alien air alarm. Hopefully they didn't breathe poison.
   components:
   - type: Sprite
@@ -161,17 +160,11 @@
       map: ["airAlarmBase"] # TODO: fire alarm enum
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Construction
 
 - type: entity
   id: AirAlarmAssemblyXeno
   parent: AirAlarmAssembly
-  name: air alarm assembly
   description: An alien air alarm. Why are the wires pulsating?...
   components:
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors_xeno.rsi
-    layers:
-    - state: alarm_b1
-      map: [ "enum.ConstructionVisuals.Layer" ]
-  - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
index 391a98e8fb..93e398a974 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
@@ -146,29 +146,15 @@
 - type: entity
   id: FireAlarmXeno
   parent: FireAlarm
-  name: fire alarm
   description: An alien fire alarm. Works just the same!
   components:
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors_xeno.rsi
-    layers:
-    - state: fire0
-      map: ["fireAlarmBase"]
-    - state: fire_off
-      map: ["fireAlarmState"]
-    - state: fire_b2
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-    - type: Construction
 
 - type: entity
   id: FireAlarmAssemblyXeno
   parent: FireAlarmAssembly
-  name: fire alarm assembly
   description: An alien fire alarm assembly. Good luck with the wires.
   components:
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors_xeno.rsi
-    layers:
-    - state: fire_b1
-      map: [ "enum.ConstructionVisuals.Layer" ]
-  - type: Construction