diff --git a/Resources/Maps/corvax_avrit.yml b/Resources/Maps/corvax_avrit.yml
index 16e4bde898..b821eb8e6c 100644
--- a/Resources/Maps/corvax_avrit.yml
+++ b/Resources/Maps/corvax_avrit.yml
@@ -161324,17 +161324,6 @@ entities:
       parent: 2
       type: Transform
     - soundSwitchMode: !type:SoundPathSpecifier
-        params:
-          variation: null
-          playoffset: 0
-          loop: False
-          referenceDistance: 1
-          rolloffFactor: 1
-          maxdistance: 25
-          busname: Master
-          pitchscale: 1
-          volume: 0
-          attenuation: Default
         path: /Audio/Machines/beep.ogg
       devices:
         'UID: 60665': 15125
@@ -162942,7 +162931,7 @@ entities:
 
         [color=#1b487e]░░█░██░██░░██░█░░[/color]               [head=3]NanoTrasen[/head]
 
-        [color=#1b487e]░░░░██░░██░██░██░[/color] 
+        [color=#1b487e]░░░░██░░██░██░██░[/color]
 
         [color=#1b487e]░░░░██░░░████░███[/color]
 
diff --git a/Resources/Maps/corvax_delta.yml b/Resources/Maps/corvax_delta.yml
index 876c1048f4..1c04545f88 100644
--- a/Resources/Maps/corvax_delta.yml
+++ b/Resources/Maps/corvax_delta.yml
@@ -192055,17 +192055,6 @@ entities:
         behaviors:
         - !type:PlaySoundBehavior
           sound: !type:SoundCollectionSpecifier
-            params:
-              variation: null
-              playoffset: 0
-              loop: False
-              referenceDistance: 1
-              rolloffFactor: 1
-              maxdistance: 25
-              busname: Master
-              pitchscale: 1
-              volume: 0
-              attenuation: Default
             collection: GlassBreak
         - !type:DoActsBehavior
           acts: Breakage
@@ -192076,17 +192065,6 @@ entities:
         behaviors:
         - !type:PlaySoundBehavior
           sound: !type:SoundCollectionSpecifier
-            params:
-              variation: null
-              playoffset: 0
-              loop: False
-              referenceDistance: 1
-              rolloffFactor: 1
-              maxdistance: 25
-              busname: Master
-              pitchscale: 1
-              volume: 0
-              attenuation: Default
             collection: GlassBreak
         - !type:SpawnEntitiesBehavior
           offset: 0.5
@@ -192121,17 +192099,6 @@ entities:
         behaviors:
         - !type:PlaySoundBehavior
           sound: !type:SoundCollectionSpecifier
-            params:
-              variation: null
-              playoffset: 0
-              loop: False
-              referenceDistance: 1
-              rolloffFactor: 1
-              maxdistance: 25
-              busname: Master
-              pitchscale: 1
-              volume: 0
-              attenuation: Default
             collection: GlassBreak
         - !type:DoActsBehavior
           acts: Breakage
@@ -192142,17 +192109,6 @@ entities:
         behaviors:
         - !type:PlaySoundBehavior
           sound: !type:SoundCollectionSpecifier
-            params:
-              variation: null
-              playoffset: 0
-              loop: False
-              referenceDistance: 1
-              rolloffFactor: 1
-              maxdistance: 25
-              busname: Master
-              pitchscale: 1
-              volume: 0
-              attenuation: Default
             collection: GlassBreak
         - !type:SpawnEntitiesBehavior
           offset: 0.5
@@ -192187,17 +192143,6 @@ entities:
         behaviors:
         - !type:PlaySoundBehavior
           sound: !type:SoundCollectionSpecifier
-            params:
-              variation: null
-              playoffset: 0
-              loop: False
-              referenceDistance: 1
-              rolloffFactor: 1
-              maxdistance: 25
-              busname: Master
-              pitchscale: 1
-              volume: 0
-              attenuation: Default
             collection: GlassBreak
         - !type:DoActsBehavior
           acts: Breakage
@@ -192208,17 +192153,6 @@ entities:
         behaviors:
         - !type:PlaySoundBehavior
           sound: !type:SoundCollectionSpecifier
-            params:
-              variation: null
-              playoffset: 0
-              loop: False
-              referenceDistance: 1
-              rolloffFactor: 1
-              maxdistance: 25
-              busname: Master
-              pitchscale: 1
-              volume: 0
-              attenuation: Default
             collection: GlassBreak
         - !type:SpawnEntitiesBehavior
           offset: 0.5
diff --git a/Resources/Maps/corvax_gate.yml b/Resources/Maps/corvax_gate.yml
index 240639efcc..7fb396e31f 100644
--- a/Resources/Maps/corvax_gate.yml
+++ b/Resources/Maps/corvax_gate.yml
@@ -103532,17 +103532,6 @@ entities:
       boltType: CannonBall
       type: Emitter
     - soundGunshot: !type:SoundPathSpecifier
-        params:
-          variation: null
-          playoffset: 0
-          loop: False
-          referenceDistance: 1
-          rolloffFactor: 1
-          maxdistance: 25
-          busname: Master
-          pitchscale: 1
-          volume: 0
-          attenuation: Default
         path: /Audio/Weapons/Guns/Gunshots/laser_cannon2.ogg
       type: Gun
     - drawRate: 1
@@ -146225,17 +146214,6 @@ entities:
       - 20943
       - 825
       portalSound: !type:SoundPathSpecifier
-        params:
-          variation: null
-          playoffset: 0
-          loop: False
-          referenceDistance: 1
-          rolloffFactor: 1
-          maxdistance: 25
-          busname: Master
-          pitchscale: 1
-          volume: 0
-          attenuation: Default
         path: /Audio/Effects/PowerSink/charge_fire.ogg
       type: Gateway
     - accessKeys: []
@@ -146255,17 +146233,6 @@ entities:
       - 20943
       - 825
       portalSound: !type:SoundPathSpecifier
-        params:
-          variation: null
-          playoffset: 0
-          loop: False
-          referenceDistance: 1
-          rolloffFactor: 1
-          maxdistance: 25
-          busname: Master
-          pitchscale: 1
-          volume: 0
-          attenuation: Default
         path: /Audio/Effects/PowerSink/charge_fire.ogg
       type: Gateway
     - accessKeys: []
@@ -146285,17 +146252,6 @@ entities:
       - 20943
       - 825
       portalSound: !type:SoundPathSpecifier
-        params:
-          variation: null
-          playoffset: 0
-          loop: False
-          referenceDistance: 1
-          rolloffFactor: 1
-          maxdistance: 25
-          busname: Master
-          pitchscale: 1
-          volume: 0
-          attenuation: Default
         path: /Audio/Effects/PowerSink/charge_fire.ogg
       type: Gateway
     - accessKeys: []
@@ -146315,17 +146271,6 @@ entities:
       - 20943
       - 825
       portalSound: !type:SoundPathSpecifier
-        params:
-          variation: null
-          playoffset: 0
-          loop: False
-          referenceDistance: 1
-          rolloffFactor: 1
-          maxdistance: 25
-          busname: Master
-          pitchscale: 1
-          volume: 0
-          attenuation: Default
         path: /Audio/Effects/PowerSink/charge_fire.ogg
       type: Gateway
     - accessKeys: []
@@ -146345,17 +146290,6 @@ entities:
       - 20943
       - 825
       portalSound: !type:SoundPathSpecifier
-        params:
-          variation: null
-          playoffset: 0
-          loop: False
-          referenceDistance: 1
-          rolloffFactor: 1
-          maxdistance: 25
-          busname: Master
-          pitchscale: 1
-          volume: 0
-          attenuation: Default
         path: /Audio/Effects/PowerSink/charge_fire.ogg
       type: Gateway
     - accessKeys: []
diff --git a/Resources/Prototypes/Maps/gemini.yml b/Resources/Prototypes/Maps/gemini.yml
index 9dd3997636..f7d0441760 100644
--- a/Resources/Prototypes/Maps/gemini.yml
+++ b/Resources/Prototypes/Maps/gemini.yml
@@ -20,6 +20,7 @@
           availableJobs:
             #service
             Captain: [ 1, 1 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 2 ]
             Botanist: [ 3, 4 ]
@@ -27,7 +28,7 @@
             Janitor: [ 4, 4 ]
             Chaplain: [ 1, 2 ]
             Librarian: [ 1, 2 ]
-            Lawyer: [ 2, 3 ]
+            # Lawyer: [ 2, 3 ] # Corvax-IAA
             Zookeeper: [ 1, 1 ]
             ServiceWorker: [ 4, 4 ]
             #engineering