diff --git a/Content.Client/Body/Systems/BodySystem.cs b/Content.Client/Body/Systems/BodySystem.cs
new file mode 100644
index 00000000000..bab785525b0
--- /dev/null
+++ b/Content.Client/Body/Systems/BodySystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Body.Systems;
+
+namespace Content.Client.Body.Systems;
+
+public sealed class BodySystem : SharedBodySystem
+{
+}
diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs
index bc33081c992..a71e4c10a84 100644
--- a/Content.Client/Buckle/BuckleSystem.cs
+++ b/Content.Client/Buckle/BuckleSystem.cs
@@ -65,7 +65,7 @@ private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref Ap
             !buckled ||
             args.Sprite == null)
         {
-            // CorvaxNext: Laying System
+            // _CorvaxNext: Laying System
             //_rotationVisualizerSystem.SetHorizontalAngle((uid, rotVisuals), rotVisuals.DefaultRotation);
             return;
         }
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index 7b55f66e699..68800a2afe5 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -4,8 +4,6 @@
 using Content.Client.Examine;
 using Content.Client.Strip;
 using Content.Client.Verbs.UI;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
-using Content.Shared.Body.Part;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -42,6 +40,7 @@ public sealed class HandsSystem : SharedHandsSystem
         public event Action<string, EntityUid>? OnPlayerItemRemoved;
         public event Action<string>? OnPlayerHandBlocked;
         public event Action<string>? OnPlayerHandUnblocked;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -52,8 +51,6 @@ public override void Initialize()
             SubscribeLocalEvent<HandsComponent, ComponentShutdown>(OnHandsShutdown);
             SubscribeLocalEvent<HandsComponent, ComponentHandleState>(HandleComponentState);
             SubscribeLocalEvent<HandsComponent, VisualsChangedEvent>(OnVisualsChanged);
-            SubscribeLocalEvent<HandsComponent, BodyPartRemovedEvent>(HandleBodyPartRemoved); // CorvaxNext: surgery
-            SubscribeLocalEvent<HandsComponent, BodyPartDisabledEvent>(HandleBodyPartDisabled); // CorvaxNext: surgery
 
             OnHandSetActive += OnHandActivated;
         }
@@ -241,40 +238,8 @@ public void UIHandAltActivateItem(string handName)
             RaisePredictiveEvent(new RequestHandAltInteractEvent(handName));
         }
 
-        #region pulling
-
-        #endregion
-
         #region visuals
 
-        // start-_CorvaxNext: surgery
-        private void HideLayers(EntityUid uid, HandsComponent component, Entity<BodyPartComponent> part, SpriteComponent? sprite = null)
-        {
-            if (part.Comp.PartType != BodyPartType.Hand || !Resolve(uid, ref sprite, logMissing: false))
-                return;
-
-            var location = part.Comp.Symmetry switch
-            {
-                BodyPartSymmetry.None => HandLocation.Middle,
-                BodyPartSymmetry.Left => HandLocation.Left,
-                BodyPartSymmetry.Right => HandLocation.Right,
-                _ => throw new ArgumentOutOfRangeException(nameof(part.Comp.Symmetry))
-            };
-
-            if (component.RevealedLayers.TryGetValue(location, out var revealedLayers))
-            {
-                foreach (var key in revealedLayers)
-                    sprite.RemoveLayer(key);
-
-                revealedLayers.Clear();
-            }
-        }
-
-        private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref BodyPartRemovedEvent args) => HideLayers(uid, component, args.Part);
-
-        private void HandleBodyPartDisabled(EntityUid uid, HandsComponent component, ref BodyPartDisabledEvent args) => HideLayers(uid, component, args.Part);
-        // end-_CorvaxNext: surgery
-
         protected override void HandleEntityInserted(EntityUid uid, HandsComponent hands, EntInsertedIntoContainerMessage args)
         {
             base.HandleEntityInserted(uid, hands, args);
@@ -299,7 +264,6 @@ protected override void HandleEntityRemoved(EntityUid uid, HandsComponent hands,
 
             if (!hands.Hands.TryGetValue(args.Container.ID, out var hand))
                 return;
-
             UpdateHandVisuals(uid, args.Entity, hand);
             _stripSys.UpdateUi(uid);
 
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
index e2c75c4b391..baea03c8923 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
@@ -1,7 +1,6 @@
 using Content.Shared.MedicalScanner;
-using Content.Shared._CorvaxNext.Targeting;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.HealthAnalyzer.UI
 {
@@ -18,13 +17,10 @@ public HealthAnalyzerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
         protected override void Open()
         {
             base.Open();
-            _window = new HealthAnalyzerWindow
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
-            };
-            _window.OnClose += Close;
-            _window.OnBodyPartSelected += SendBodyPartMessage;
-            _window.OpenCentered();
+
+            _window = this.CreateWindow<HealthAnalyzerWindow>();
+
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
         }
 
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
@@ -37,22 +33,5 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
 
             _window.Populate(cast);
         }
-
-        private void SendBodyPartMessage(TargetBodyPart? part, EntityUid target) => SendMessage(new HealthAnalyzerPartMessage(EntMan.GetNetEntity(target), part ?? null));
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            if (_window != null)
-            {
-                _window.OnClose -= Close;
-                _window.OnBodyPartSelected -= SendBodyPartMessage;
-            }
-
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
index 0a0b5ac89e7..aae8785b1fe 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
@@ -1,8 +1,8 @@
-<controls:FancyWindow
+<controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     MaxHeight="525"
-    MinWidth="350">
+    MinWidth="300">
     <ScrollContainer
         Margin="5 5 5 5"
         ReturnMeasure="True"
@@ -13,215 +13,45 @@
             Orientation="Vertical">
             <Label
                 Name="NoPatientDataText"
-                Text="{Loc health-analyzer-window-no-patient-data-text}"/>
-            <Button Name="ReturnButton"
-                    Text="{Loc 'health-analyzer-window-return-button-text'}"
-                    Margin="0 0 0 10"
-                    HorizontalExpand="False"/>
+                Text="{Loc health-analyzer-window-no-patient-data-text}" />
+
             <BoxContainer
                 Name="PatientDataContainer"
                 Margin="0 0 0 5"
                 Orientation="Vertical">
-                <BoxContainer Orientation="Horizontal"
-                              Margin="0 0 0 5">
-                    <PanelContainer>
-                        <SpriteView OverrideDirection="South"
-                                    Scale="2.5 2.5"
-                                    Name="SpriteView"
-                                    Access="Public"
-                                    SetSize="96 96"/>
-                        <PanelContainer
-                            Name="PartView"
-                            SetSize="57 96"
-                            Margin="18 0 0 0"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Left">
-                            <PanelContainer
-                                SetSize="15 33"
-                                Margin="4 0 0 0"
-                                HorizontalAlignment="Left">
-                                <TextureButton
-                                    Name="RightArmButton"
-                                    MinSize="15 25"
-                                    StyleClasses="TargetDollButtonRightArm"
-                                    VerticalAlignment="Top">
-                                </TextureButton>
-                                <TextureButton
-                                    Name="RightHandButton"
-                                    MinSize="15 15"
-                                    VerticalAlignment="Bottom"
-                                    StyleClasses="TargetDollButtonRightHand">
-                                </TextureButton>
-                            </PanelContainer>
-                            <PanelContainer
-                                SetSize="43 75"
-                                Margin="0 0 0 0"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center">
-                                <TextureButton
-                                    Name="HeadButton"
-                                    MinSize="28 23"
-                                    VerticalAlignment="Top"
-                                    HorizontalAlignment="Center"
-                                    StyleClasses="TargetDollButtonHead">
-                                    <!--<PanelContainer
-                            SetSize="15 15"
-                            Margin="0 9 0 0"
-                            HorizontalAlignment="Center">
-                            <TextureButton
-                                Name="EyesButton"
-                                MinSize="15 9"
-                                VerticalAlignment="Top"
-                                StyleClasses="TargetDollButtonEyes">
-                                <TextureRect
-                                    TexturePath="/Textures/Interface/Targeting/Doll/eyes.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="15 9"/>
-                            </TextureButton>
-                            <TextureButton
-                                Name="MouthButton"
-                                SetSize="9 6"
-                                VerticalAlignment="Bottom"
-                                StyleClasses="TargetDollButtonMouth">
-                                <TextureRect
-                                    TexturePath="/Textures/Interface/Targeting/Doll/mouth.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="9 6"/>
-                            </TextureButton>
-                        </PanelContainer>-->
-                                </TextureButton>
-                                <TextureButton
-                                    Name="ChestButton"
-                                    SetSize="28 30"
-                                    Margin="0 18 0 0"
-                                    VerticalAlignment="Top"
-                                    HorizontalAlignment="Center"
-                                    StyleClasses="TargetDollButtonChest">
-                                </TextureButton>
-                                <PanelContainer
-                                    MinSize="38 35"
-                                    VerticalAlignment="Bottom"
-                                    HorizontalAlignment="Center">
-                                    <TextureButton
-                                        Name="GroinButton"
-                                        MinSize="28 15"
-                                        VerticalAlignment="Top"
-                                        HorizontalAlignment="Center"
-                                        StyleClasses="TargetDollButtonGroin">
-                                    </TextureButton>
-                                    <PanelContainer
-                                        MinSize="20 30"
-                                        VerticalAlignment="Bottom"
-                                        HorizontalAlignment="Right">
-                                        <TextureButton
-                                            Name="LeftLegButton"
-                                            MinSize="15 28"
-                                            VerticalAlignment="Top"
-                                            HorizontalAlignment="Left"
-                                            StyleClasses="TargetDollButtonLeftLeg">
-                                        </TextureButton>
-                                        <TextureButton
-                                            Name="LeftFootButton"
-                                            MinSize="20 10"
-                                            VerticalAlignment="Bottom"
-                                            StyleClasses="TargetDollButtonLeftFoot">
-                                        </TextureButton>
-                                    </PanelContainer>
-                                    <PanelContainer
-                                        MinSize="20 30"
-                                        VerticalAlignment="Bottom"
-                                        HorizontalAlignment="Left">
-                                        <TextureButton
-                                            Name="RightLegButton"
-                                            MinSize="15 28"
-                                            VerticalAlignment="Top"
-                                            HorizontalAlignment="Right"
-                                            StyleClasses="TargetDollButtonRightLeg">
-                                        </TextureButton>
-                                        <TextureButton
-                                            Name="RightFootButton"
-                                            MinSize="20 10"
-                                            VerticalAlignment="Bottom"
-                                            HorizontalAlignment="Center"
-                                            StyleClasses="TargetDollButtonRightFoot">
-                                        </TextureButton>
-                                    </PanelContainer>
-                                </PanelContainer>
-                            </PanelContainer>
-                            <PanelContainer
-                                SetSize="15 33"
-                                Margin="0 0 4 0"
-                                HorizontalAlignment="Right">
-                                <TextureButton
-                                    Name="LeftArmButton"
-                                    MinSize="15 25"
-                                    StyleClasses="TargetDollButtonLeftArm"
-                                    VerticalAlignment="Top">
-                                </TextureButton>
-                                <TextureButton
-                                    Name="LeftHandButton"
-                                    MinSize="15 15"
-                                    VerticalAlignment="Bottom"
-                                    StyleClasses="TargetDollButtonLeftHand">
-                                </TextureButton>
-                            </PanelContainer>
-                        </PanelContainer>
-                    </PanelContainer>
-                    <TextureRect Name="NoDataTex"
-                                 Access="Public"
-                                 SetSize="64 64"
-                                 Visible="false"
-                                 Stretch="KeepAspectCentered"
-                                 TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/>
-                    <BoxContainer Margin="5 0 0 0"
-                                  Orientation="Vertical"
-                                  VerticalAlignment="Top">
-                        <RichTextLabel Name="NameLabel"
-                                       SetWidth="150"/>
-                        <Label Name="SpeciesLabel"
-                               VerticalAlignment="Top"
-                               StyleClasses="LabelSubText"/>
-                        <Label Name="PartNameLabel"
-                               VerticalAlignment="Bottom"
-                               StyleClasses="LabelSubText"/>
+                <BoxContainer Orientation="Horizontal" Margin="0 0 0 5">
+                    <SpriteView OverrideDirection="South" Scale="2 2" Name="SpriteView" Access="Public" SetSize="64 64" />
+                    <TextureRect Name="NoDataTex" Access="Public" SetSize="64 64" Visible="false" Stretch="KeepAspectCentered" TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/>
+                    <BoxContainer Margin="5 0 0 0" Orientation="Vertical" VerticalAlignment="Top">
+                        <RichTextLabel Name="NameLabel" SetWidth="150" />
+                        <Label Name="SpeciesLabel" VerticalAlignment="Top" StyleClasses="LabelSubText" />
                     </BoxContainer>
-                    <Label Margin="0 0 5 0"
-                           HorizontalExpand="True"
-                           HorizontalAlignment="Right"
-                           VerticalExpand="True"
-                           VerticalAlignment="Top"
-                           Name="ScanModeLabel"
-                           Text="{Loc 'health-analyzer-window-entity-unknown-text'}"/>
+                    <Label Margin="0 0 5 0" HorizontalExpand="True" HorizontalAlignment="Right" VerticalExpand="True"
+                           VerticalAlignment="Top" Name="ScanModeLabel"
+                           Text="{Loc 'health-analyzer-window-entity-unknown-text'}" />
                 </BoxContainer>
 
-                <PanelContainer StyleClasses="LowDivider"/>
+                <PanelContainer StyleClasses="LowDivider" />
 
-                <GridContainer Margin="0 5 0 0"
-                               Columns="2">
-                    <Label Text="{Loc 'health-analyzer-window-entity-status-text'}"/>
-                    <Label Name="StatusLabel"/>
-                    <Label Text="{Loc 'health-analyzer-window-entity-temperature-text'}"/>
-                    <Label Name="TemperatureLabel"/>
-                    <Label Text="{Loc 'health-analyzer-window-entity-blood-level-text'}"/>
-                    <Label Name="BloodLabel"/>
-                    <Label Text="{Loc 'health-analyzer-window-entity-damage-total-text'}"/>
-                    <Label Name="DamageLabel"/>
+                <GridContainer Margin="0 5 0 0" Columns="2">
+                    <Label Text="{Loc 'health-analyzer-window-entity-status-text'}" />
+                    <Label Name="StatusLabel" />
+                    <Label Text="{Loc 'health-analyzer-window-entity-temperature-text'}" />
+                    <Label Name="TemperatureLabel" />
+                    <Label Text="{Loc 'health-analyzer-window-entity-blood-level-text'}" />
+                    <Label Name="BloodLabel" />
+                    <Label Text="{Loc 'health-analyzer-window-entity-damage-total-text'}" />
+                    <Label Name="DamageLabel" />
                 </GridContainer>
             </BoxContainer>
 
-            <PanelContainer Name="AlertsDivider"
-                            Visible="False"
-                            StyleClasses="LowDivider"/>
+            <PanelContainer Name="AlertsDivider" Visible="False" StyleClasses="LowDivider" />
 
-            <BoxContainer Name="AlertsContainer"
-                          Visible="False"
-                          Margin="0 5"
-                          Orientation="Vertical"
-                          HorizontalAlignment="Center">
+            <BoxContainer Name="AlertsContainer" Visible="False" Margin="0 5" Orientation="Vertical" HorizontalAlignment="Center">
 
             </BoxContainer>
 
-            <PanelContainer StyleClasses="LowDivider"/>
+            <PanelContainer StyleClasses="LowDivider" />
 
             <BoxContainer
                 Name="GroupsContainer"
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
index 4233c6efe07..fd3615d59f5 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
@@ -4,7 +4,6 @@
 using Content.Shared.Atmos;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Alert;
-using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -37,18 +36,6 @@ public sealed partial class HealthAnalyzerWindow : FancyWindow
         private readonly IPrototypeManager _prototypes;
         private readonly IResourceCache _cache;
 
-        // Start-_CorvaxNext: surgery
-        public event Action<TargetBodyPart?, EntityUid>? OnBodyPartSelected;
-        private EntityUid _spriteViewEntity;
-
-        [ValidatePrototypeId<EntityPrototype>]
-        private readonly EntProtoId _bodyView = "AlertSpriteView";
-
-        private readonly Dictionary<TargetBodyPart, TextureButton> _bodyPartControls;
-        private EntityUid? _target;
-
-        // End-_CorvaxNext: surgery
-
         public HealthAnalyzerWindow()
         {
             RobustXamlLoader.Load(this);
@@ -58,78 +45,19 @@ public HealthAnalyzerWindow()
             _spriteSystem = _entityManager.System<SpriteSystem>();
             _prototypes = dependencies.Resolve<IPrototypeManager>();
             _cache = dependencies.Resolve<IResourceCache>();
-            // Start-_CorvaxNext: surgery
-            _bodyPartControls = new Dictionary<TargetBodyPart, TextureButton>
-            {
-                { TargetBodyPart.Head, HeadButton },
-                { TargetBodyPart.Torso, ChestButton },
-                { TargetBodyPart.Groin, GroinButton },
-                { TargetBodyPart.LeftArm, LeftArmButton },
-                { TargetBodyPart.LeftHand, LeftHandButton },
-                { TargetBodyPart.RightArm, RightArmButton },
-                { TargetBodyPart.RightHand, RightHandButton },
-                { TargetBodyPart.LeftLeg, LeftLegButton },
-                { TargetBodyPart.LeftFoot, LeftFootButton },
-                { TargetBodyPart.RightLeg, RightLegButton },
-                { TargetBodyPart.RightFoot, RightFootButton },
-            };
-
-            foreach (var bodyPartButton in _bodyPartControls)
-            {
-                bodyPartButton.Value.MouseFilter = MouseFilterMode.Stop;
-                bodyPartButton.Value.OnPressed += _ => SetActiveBodyPart(bodyPartButton.Key, bodyPartButton.Value);
-            }
-            ReturnButton.OnPressed += _ => ResetBodyPart();
-            // End-_CorvaxNext: surgery
-        }
-
-        public void SetActiveBodyPart(TargetBodyPart part, TextureButton button)
-        {
-            if (_target == null)
-                return;
-
-            // Bit of the ole shitcode until we have Groins in the prototypes.
-            OnBodyPartSelected?.Invoke(part == TargetBodyPart.Groin ? TargetBodyPart.Torso : part, _target.Value);
-        }
-
-        public void ResetBodyPart()
-        {
-            if (_target == null)
-                return;
-
-            OnBodyPartSelected?.Invoke(null, _target.Value);
-        }
-
-        public void SetActiveButtons(bool isHumanoid)
-        {
-            foreach (var button in _bodyPartControls)
-                button.Value.Visible = isHumanoid;
         }
 
         public void Populate(HealthAnalyzerScannedUserMessage msg)
         {
-            // Start-_CorvaxNext: surgery
-            _target = _entityManager.GetEntity(msg.TargetEntity);
-            EntityUid? part = msg.Part != null ? _entityManager.GetEntity(msg.Part.Value) : null;
-            var isPart = part != null;
+            var target = _entityManager.GetEntity(msg.TargetEntity);
 
-            if (_target == null
-                || !_entityManager.TryGetComponent<DamageableComponent>(isPart ? part : _target, out var damageable))
+            if (target == null
+                || !_entityManager.TryGetComponent<DamageableComponent>(target, out var damageable))
             {
                 NoPatientDataText.Visible = true;
                 return;
             }
 
-            SetActiveButtons(_entityManager.HasComponent<TargetingComponent>(_target.Value));
-
-            ReturnButton.Visible = isPart;
-            PartNameLabel.Visible = isPart;
-
-            if (part != null)
-                PartNameLabel.Text = _entityManager.HasComponent<MetaDataComponent>(part)
-                    ? Identity.Name(part.Value, _entityManager)
-                    : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
-
             NoPatientDataText.Visible = false;
 
             // Scan Mode
@@ -144,20 +72,19 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
 
             // Patient Information
 
-            SpriteView.SetEntity(SetupIcon(msg.Body) ?? _target.Value);
+            SpriteView.SetEntity(target.Value);
             SpriteView.Visible = msg.ScanMode.HasValue && msg.ScanMode.Value;
-            PartView.Visible = SpriteView.Visible;
             NoDataTex.Visible = !SpriteView.Visible;
 
             var name = new FormattedMessage();
             name.PushColor(Color.White);
-            name.AddText(_entityManager.HasComponent<MetaDataComponent>(_target.Value)
-                ? Identity.Name(_target.Value, _entityManager)
+            name.AddText(_entityManager.HasComponent<MetaDataComponent>(target.Value)
+                ? Identity.Name(target.Value, _entityManager)
                 : Loc.GetString("health-analyzer-window-entity-unknown-text"));
             NameLabel.SetMessage(name);
 
             SpeciesLabel.Text =
-                _entityManager.TryGetComponent<HumanoidAppearanceComponent>(_target.Value,
+                _entityManager.TryGetComponent<HumanoidAppearanceComponent>(target.Value,
                     out var humanoidAppearanceComponent)
                     ? Loc.GetString(_prototypes.Index<SpeciesPrototype>(humanoidAppearanceComponent.Species).Name)
                     : Loc.GetString("health-analyzer-window-entity-unknown-species-text");
@@ -173,7 +100,7 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
                 : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
 
             StatusLabel.Text =
-                _entityManager.TryGetComponent<MobStateComponent>(_target.Value, out var mobStateComponent)
+                _entityManager.TryGetComponent<MobStateComponent>(target.Value, out var mobStateComponent)
                     ? GetStatus(mobStateComponent.CurrentState)
                     : Loc.GetString("health-analyzer-window-entity-unknown-text");
 
@@ -191,27 +118,21 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
             if (showAlerts)
                 AlertsContainer.DisposeAllChildren();
 
-            if (msg.Unrevivable == true) // Right now this does nothing, but we have it just for parity :)
-            {
-                var unrevivableLabel = new RichTextLabel
+            if (msg.Unrevivable == true)
+                AlertsContainer.AddChild(new RichTextLabel
                 {
+                    Text = Loc.GetString("health-analyzer-window-entity-unrevivable-text"),
                     Margin = new Thickness(0, 4),
                     MaxWidth = 300
-                };
-                unrevivableLabel.SetMessage(Loc.GetString("health-analyzer-window-entity-unrevivable-text"), defaultColor: Color.Red);
-                AlertsContainer.AddChild(unrevivableLabel);
-            }
+                });
 
             if (msg.Bleeding == true)
-            {
-                var bleedingLabel = new RichTextLabel
+                AlertsContainer.AddChild(new RichTextLabel
                 {
+                    Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"),
                     Margin = new Thickness(0, 4),
                     MaxWidth = 300
-                };
-                bleedingLabel.SetMessage(Loc.GetString("health-analyzer-window-entity-bleeding-text"), defaultColor: Color.Red);
-                AlertsContainer.AddChild(bleedingLabel);
-            }
+                });
 
             // Damage Groups
 
@@ -222,7 +143,6 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
             IReadOnlyDictionary<string, FixedPoint2> damagePerType = damageable.Damage.DamageDict;
 
             DrawDiagnosticGroups(damageSortedGroups, damagePerType);
-            // End-_CorvaxNext: surgery
         }
 
         private static string GetStatus(MobState mobState)
@@ -323,41 +243,5 @@ private BoxContainer CreateDiagnosticGroupTitle(string text, string id)
 
             return rootContainer;
         }
-
-        // Start-_CorvaxNext: surgery
-        /// <summary>
-        /// Sets up the Body Doll using Alert Entity to use in Health Analyzer.
-        /// </summary>
-        private EntityUid? SetupIcon(Dictionary<TargetBodyPart, TargetIntegrity>? body)
-        {
-            if (body is null)
-                return null;
-
-            if (!_entityManager.Deleted(_spriteViewEntity))
-                _entityManager.QueueDeleteEntity(_spriteViewEntity);
-
-            _spriteViewEntity = _entityManager.Spawn(_bodyView);
-
-            if (!_entityManager.TryGetComponent<SpriteComponent>(_spriteViewEntity, out var sprite))
-                return null;
-
-            int layer = 0;
-            foreach (var (bodyPart, integrity) in body)
-            {
-                // TODO: Fix this way PartStatusUIController and make it use layers instead of TextureRects
-                string enumName = Enum.GetName(typeof(TargetBodyPart), bodyPart) ?? "Unknown";
-                int enumValue = (int)integrity;
-                var rsi = new SpriteSpecifier.Rsi(new ResPath($"/Textures/Interface/Targeting/Status/{enumName.ToLowerInvariant()}.rsi"), $"{enumName.ToLowerInvariant()}_{enumValue}");
-                // It's probably shitcode but im lazy to get into sprite stuff - It is shitcode :)
-                if (!sprite.TryGetLayer(layer, out _))
-                    sprite.AddLayer(_spriteSystem.Frame0(rsi));
-                else
-                    sprite.LayerSetTexture(layer, _spriteSystem.Frame0(rsi));
-                sprite.LayerSetScale(layer, new Vector2(3f, 3f));
-                layer++;
-            }
-            return _spriteViewEntity;
-        }
-        // End-_CorvaxNext: surgery
     }
 }
diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 4fa0ce0f858..6eb5dd9ec98 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -55,8 +55,7 @@ private void UpdateLayers(HumanoidAppearanceComponent component, SpriteComponent
         foreach (var (key, info) in component.CustomBaseLayers)
         {
             oldLayers.Remove(key);
-            // CorvaxNext modification: For whatever reason these weren't actually ignoring the skin color as advertised.
-            SetLayerData(component, sprite, key, info.Id, sexMorph: false, color: info.Color, overrideSkin: true);
+            SetLayerData(component, sprite, key, info.Id, sexMorph: false, color: info.Color);
         }
 
         // hide old layers
@@ -74,8 +73,7 @@ private void SetLayerData(
         HumanoidVisualLayers key,
         string? protoId,
         bool sexMorph = false,
-        Color? color = null,
-        bool overrideSkin = false)
+        Color? color = null)
     {
         var layerIndex = sprite.LayerMapReserveBlank(key);
         var layer = sprite[layerIndex];
@@ -93,7 +91,7 @@ private void SetLayerData(
         var proto = _prototypeManager.Index<HumanoidSpeciesSpriteLayer>(protoId);
         component.BaseLayers[key] = proto;
 
-        if (proto.MatchSkin && !overrideSkin)
+        if (proto.MatchSkin)
             layer.Color = component.SkinColor.WithAlpha(proto.LayerAlpha);
 
         if (proto.BaseSprite != null)
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 0d862774702..eff1a144003 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -84,12 +84,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
-            human.AddFunction(ContentKeyFunctions.TargetHead); // CorvaxNext: surgery
-            human.AddFunction(ContentKeyFunctions.TargetTorso); // CorvaxNext: surgery
-            human.AddFunction(ContentKeyFunctions.TargetLeftArm); // CorvaxNext: surgery
-            human.AddFunction(ContentKeyFunctions.TargetRightArm); // CorvaxNext: surgery
-            human.AddFunction(ContentKeyFunctions.TargetLeftLeg); // CorvaxNext: surgery
-            human.AddFunction(ContentKeyFunctions.TargetRightLeg); // CorvaxNext: surgery
             human.AddFunction(ContentKeyFunctions.OfferItem); // Corvax-Next-Offer
             human.AddFunction(ContentKeyFunctions.ToggleStanding); // CorvaxNext: laying system toggle standing
 
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index 3442a2d34d0..87cea4e3d2f 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Storage;
-using Content.Shared._CorvaxNext.Targeting;
 using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
@@ -40,6 +39,7 @@ public override void Initialize()
 
             SubscribeLocalEvent<InventorySlotsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
             SubscribeLocalEvent<InventorySlotsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+
             SubscribeLocalEvent<InventoryComponent, ComponentShutdown>(OnShutdown);
 
             SubscribeLocalEvent<InventorySlotsComponent, DidEquipEvent>((_, comp, args) =>
@@ -235,23 +235,9 @@ public void UIInventoryAltActivateItem(string slot, EntityUid uid)
             EntityManager.RaisePredictiveEvent(new InteractInventorySlotEvent(GetNetEntity(item.Value), altInteract: true));
         }
 
-        protected override void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
-        {
-            base.UpdateInventoryTemplate(ent);
-
-            if (TryComp(ent, out InventorySlotsComponent? inventorySlots))
-            {
-                foreach (var slot in ent.Comp.Slots)
-                {
-                    if (inventorySlots.SlotData.TryGetValue(slot.Name, out var slotData))
-                        slotData.SlotDef = slot;
-                }
-            }
-        }
-
         public sealed class SlotData
         {
-            public SlotDefinition SlotDef;
+            public readonly SlotDefinition SlotDef;
             public EntityUid? HeldEntity => Container?.ContainedEntity;
             public bool Blocked;
             public bool Highlighted;
diff --git a/Content.Client/Inventory/InventorySlotsComponent.cs b/Content.Client/Inventory/InventorySlotsComponent.cs
index 84bc7d54392..d4667bcef33 100644
--- a/Content.Client/Inventory/InventorySlotsComponent.cs
+++ b/Content.Client/Inventory/InventorySlotsComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Client.Inventory;
 public sealed partial class InventorySlotsComponent : Component
 {
     [ViewVariables]
-    public readonly Dictionary<string, ClientInventorySystem.SlotData> SlotData = new();
+    public readonly Dictionary<string, ClientInventorySystem.SlotData> SlotData = new ();
 
     /// <summary>
     ///     Data about the current layers that have been added to the players sprite due to the items in each equipment slot.
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 8d8ccd5ed5c..f181630a1c4 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -169,7 +169,7 @@ void HandleToggleAutoGetUp(BaseButton.ButtonToggledEventArgs args) // WD EDIT
             AddButton(EngineKeyFunctions.MoveRight);
             AddButton(EngineKeyFunctions.Walk);
             AddCheckBox("ui-options-hotkey-toggle-walk", _cfg.GetCVar(CCVars.ToggleWalk), HandleToggleWalk);
-            AddCheckBox("ui-options-hotkey-auto-up", _cfg.GetCVar(Shared._CorvaxNext.NextVars.NextVars.AutoGetUp), HandleToggleAutoGetUp); // CorvaxNext: Laying System
+            AddCheckBox("ui-options-hotkey-auto-up", _cfg.GetCVar(Shared._CorvaxNext.NextVars.NextVars.AutoGetUp), HandleToggleAutoGetUp); // _CorvaxNext: Laying System
             InitToggleWalk();
 
             AddHeader("ui-options-header-camera");
@@ -194,7 +194,7 @@ void HandleToggleAutoGetUp(BaseButton.ButtonToggledEventArgs args) // WD EDIT
             AddButton(ContentKeyFunctions.RotateStoredItem);
             AddButton(ContentKeyFunctions.SaveItemLocation);
             AddButton(ContentKeyFunctions.OfferItem); // Corvax-Next-Offer
-            AddButton(ContentKeyFunctions.ToggleStanding); // CorvaxNext: Laying System
+            AddButton(ContentKeyFunctions.ToggleStanding); // _CorvaxNext: Laying System
             AddHeader("ui-options-header-interaction-adv");
             AddButton(ContentKeyFunctions.SmartEquipBackpack);
             AddButton(ContentKeyFunctions.SmartEquipBelt);
@@ -240,20 +240,6 @@ void HandleToggleAutoGetUp(BaseButton.ButtonToggledEventArgs args) // WD EDIT
             AddButton(EngineKeyFunctions.EscapeMenu);
             AddButton(ContentKeyFunctions.EscapeContext);
 
-            // start-_CorvaxNext: surgery
-            AddHeader("ui-options-header-targeting");
-            AddButton(ContentKeyFunctions.TargetHead);
-            AddButton(ContentKeyFunctions.TargetTorso);
-            AddButton(ContentKeyFunctions.TargetLeftArm);
-            AddButton(ContentKeyFunctions.TargetLeftHand);
-            AddButton(ContentKeyFunctions.TargetRightArm);
-            AddButton(ContentKeyFunctions.TargetRightHand);
-            AddButton(ContentKeyFunctions.TargetLeftLeg);
-            AddButton(ContentKeyFunctions.TargetLeftFoot);
-            AddButton(ContentKeyFunctions.TargetRightLeg);
-            AddButton(ContentKeyFunctions.TargetRightFoot);
-            // end-_CorvaxNext: surgery
-
             AddHeader("ui-options-header-misc");
             AddButton(ContentKeyFunctions.TakeScreenshot);
             AddButton(ContentKeyFunctions.TakeScreenshotNoUI);
diff --git a/Content.Client/Smoking/MatchstickSystem.cs b/Content.Client/Smoking/MatchstickSystem.cs
deleted file mode 100644
index 3568642861e..00000000000
--- a/Content.Client/Smoking/MatchstickSystem.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// CorvaxNext Change Start
-
-using Content.Shared.Smoking.Systems;
-
-namespace Content.Client.Smoking;
-
-public sealed class MatchstickSystem : SharedMatchstickSystem;
-
-// CorvaxNext Change End
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 9b272b06440..55e7ec09498 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -1642,60 +1642,6 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                         BackgroundColor = FancyTreeSelectedRowColor,
                     }),
 
-                // end-_CorvaxNext: surgery Shitmed Edit Start
-                Element<TextureButton>().Class("TargetDollButtonHead")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/head_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonChest")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/torso_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonGroin")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/groin_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonLeftArm")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/leftarm_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonLeftHand")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/lefthand_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonRightArm")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/rightarm_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonRightHand")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/righthand_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonLeftLeg")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/leftleg_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonLeftFoot")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/leftfoot_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonRightLeg")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/rightleg_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonRightFoot")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/rightfoot_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonEyes")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/eyes_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonMouth")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/mouth_hover.png")),
-                // end-_CorvaxNext: surgery Shitmed Edit End
-
                 // Silicon law edit ui
                 Element<Label>().Class(SiliconLawContainer.StyleClassSiliconLawPositionLabel)
                     .Prop(Label.StylePropertyFontColor, NanoGold),
@@ -1714,7 +1660,6 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     {
                         new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/un_pinned.png"))
                     })
-
             }).ToList());
         }
     }
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
index 8d9d1b6716b..54aeffe72c9 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
@@ -9,7 +9,6 @@
     xmlns:hotbar="clr-namespace:Content.Client.UserInterface.Systems.Hotbar.Widgets"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Widgets"
-    xmlns:targeting="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets"
     Name="DefaultHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"
@@ -29,7 +28,6 @@
     <widgets:GhostGui Name="Ghost" Access="Protected" />
     <inventory:InventoryGui Name="Inventory" Access="Protected" />
     <hotbar:HotbarGui Name="Hotbar" Access="Protected" />
-    <targeting:TargetingControl Name="Targeting" Access="Protected"/>
     <chat:ResizableChatBox Name="Chat" Access="Protected" />
     <alerts:AlertsUI Name="Alerts" Access="Protected" />
 </screens:DefaultGameScreen>
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
index 1a33de70a97..12f8422aeb2 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
@@ -22,12 +22,11 @@ public DefaultGameScreen()
         SetAnchorAndMarginPreset(Hotbar, LayoutPreset.BottomWide, margin: 5);
         SetAnchorAndMarginPreset(Chat, LayoutPreset.TopRight, margin: 10);
         SetAnchorAndMarginPreset(Alerts, LayoutPreset.TopRight, margin: 10);
-        SetAnchorAndMarginPreset(Targeting, LayoutPreset.BottomRight, margin: 5);
 
         Chat.OnResized += ChatOnResized;
         Chat.OnChatResizeFinish += ChatOnResizeFinish;
+
         MainViewport.OnResized += ResizeActionContainer;
-        MainViewport.OnResized += ResizeAlertsContainer; // Corvax-Next-Surgery
         Inventory.OnResized += ResizeActionContainer;
     }
 
@@ -37,14 +36,6 @@ private void ResizeActionContainer()
         Actions.ActionsContainer.MaxGridHeight = MainViewport.Size.Y - indent;
     }
 
-	// Corvax-Next-Surgery-Start
-    private void ResizeAlertsContainer()
-    {
-        float indent = Chat.Size.Y + Targeting.Size.Y + 120;
-        Alerts.AlertContainer.MaxGridHeight = Math.Max(MainViewport.Size.Y - indent, 1);
-    }
-	// Corvax-Next-Surgery-End
-
     private void ChatOnResizeFinish(Vector2 _)
     {
         var marginBottom = Chat.GetValue<float>(MarginBottomProperty);
diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
index 2f4570143ff..653302fae4c 100644
--- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
@@ -10,7 +10,6 @@
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Widgets"
-    xmlns:targeting="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets"
     Name="SeparatedChatHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"
@@ -21,7 +20,6 @@
             <widgets:GhostGui Name="Ghost" Access="Protected" />
             <inventory:InventoryGui Name="Inventory" Access="Protected"/>
             <hotbar:HotbarGui Name="Hotbar" Access="Protected"/>
-            <targeting:TargetingControl Name="Targeting" Access="Protected"/>
             <BoxContainer Name="TopLeftContainer" Orientation="Vertical">
                 <actions:ActionsBar Name="Actions" Access="Protected" />
                 <BoxContainer Name="VoteMenu" Access="Public" Orientation="Vertical"/>
diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
index bd737b80beb..2892ca44254 100644
--- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
@@ -23,7 +23,6 @@ public SeparatedChatGameScreen()
         SetAnchorAndMarginPreset(Ghost, LayoutPreset.BottomWide, margin: 80);
         SetAnchorAndMarginPreset(Hotbar, LayoutPreset.BottomWide, margin: 5);
         SetAnchorAndMarginPreset(Alerts, LayoutPreset.CenterRight, margin: 10);
-        SetAnchorAndMarginPreset(Targeting, LayoutPreset.BottomRight, margin: 5);
 
         ScreenContainer.OnSplitResizeFinished += () =>
             OnChatResized?.Invoke(new Vector2(ScreenContainer.SplitFraction, 0));
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
index 0731524f496..9a273d2ed14 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
@@ -1,11 +1,7 @@
 <widgets:AlertsUI xmlns="https://spacestation14.io"
                   xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Alerts.Widgets"
-                  xmlns:partStatus="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets"
                   MinSize="64 64">
-    <GridContainer Columns="1" HorizontalAlignment="Right" VerticalAlignment="Top">
-        <PanelContainer>
-            <GridContainer Name="AlertContainer" Columns="1" HorizontalAlignment="Right" VerticalAlignment="Center" Access="Public" /> <!-- Corvax-Next-Surgery -->
-        </PanelContainer>
-        <partStatus:PartStatusControl Name="PartStatus" Access="Protected"/>
-    </GridContainer>
+    <PanelContainer HorizontalAlignment="Right" VerticalAlignment="Top">
+        <BoxContainer Name="AlertContainer" Access="Public" Orientation="Vertical" />
+    </PanelContainer>
 </widgets:AlertsUI>
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
index 43002cc7bfe..d6a79a81c46 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
@@ -20,7 +20,6 @@ public sealed partial class AlertsUI : UIWidget
     public AlertsUI()
     {
         RobustXamlLoader.Load(this);
-        LayoutContainer.SetGrowHorizontal(this, LayoutContainer.GrowDirection.Begin); // Corvax-Next-Surgery
     }
 
     public void SyncControls(AlertsSystem alertsSystem,
diff --git a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
index 0118f7f14f6..49a2fba8981 100644
--- a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
@@ -138,9 +138,10 @@ private void UpdateInventoryHotbar(InventorySlotsComponent? clientInv)
 
             return;
         }
+
         foreach (var (_, data) in clientInv.SlotData)
         {
-            if (!data.ShowInWindow || data.SlotDef.Disabled || !_slotGroups.TryGetValue(data.SlotGroup, out var container))
+            if (!data.ShowInWindow || !_slotGroups.TryGetValue(data.SlotGroup, out var container))
                 continue;
 
             if (!container.TryGetButton(data.SlotName, out var button))
@@ -213,6 +214,7 @@ private void UpdateStrippingWindow(InventorySlotsComponent? clientInv)
         {
             if (!data.ShowInWindow)
                 continue;
+
             if (!_strippingWindow!.InventoryButtons.TryGetButton(data.SlotName, out var button))
             {
                 button = CreateSlotButton(data);
diff --git a/Content.Client/Xenonids/UI/XenoChoiceControl.xaml b/Content.Client/Xenonids/UI/XenoChoiceControl.xaml
deleted file mode 100644
index 9ca43289a28..00000000000
--- a/Content.Client/Xenonids/UI/XenoChoiceControl.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- start-_CorvaxNext: surgery -->
-<ui:XenoChoiceControl
-    xmlns="https://spacestation14.io"
-    xmlns:ui="clr-namespace:Content.Client.Xenonids.UI">
-    <BoxContainer Orientation="Horizontal">
-        <Button Name="Button" Access="Public"
-                HorizontalExpand="True" VerticalExpand="False"
-                StyleClasses="ButtonSquare" Margin="0">
-            <BoxContainer Orientation="Horizontal" Margin="0">
-                <TextureRect Name="Texture" Access="Public"
-                             HorizontalExpand="False" VerticalExpand="False"
-                             Margin="1"/>
-                <Control MinWidth="5"/>
-                <RichTextLabel Name="NameLabel" Access="Public" VerticalAlignment="Center"/>
-            </BoxContainer>
-        </Button>
-    </BoxContainer>
-</ui:XenoChoiceControl>
-<!-- end-_CorvaxNext: surgery -->
diff --git a/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs b/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs
deleted file mode 100644
index 62504368f2b..00000000000
--- a/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Xenonids.UI;
-
-// start-_CorvaxNext: surgery
-[GenerateTypedNameReferences]
-[Virtual]
-public partial class XenoChoiceControl : Control
-{
-    public XenoChoiceControl() => RobustXamlLoader.Load(this);
-
-    public void Set(string name, Texture? texture)
-    {
-        NameLabel.SetMessage(name);
-        Texture.Texture = texture;
-    }
-
-    public void Set(FormattedMessage msg, Texture? texture)
-    {
-        NameLabel.SetMessage(msg);
-        Texture.Texture = texture;
-    }
-}
-// end-_CorvaxNext: surgery
diff --git a/Content.Client/_CorvaxNext/Body/BodySystem.cs b/Content.Client/_CorvaxNext/Body/BodySystem.cs
deleted file mode 100644
index 10dc057a8fd..00000000000
--- a/Content.Client/_CorvaxNext/Body/BodySystem.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using Content.Shared.Body.Systems;
-using Content.Shared.Body.Part;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Robust.Client.GameObjects;
-using Robust.Shared.Utility;
-using Content.Shared.Body.Components;
-
-namespace Content.Client.Body.Systems;
-
-public sealed class BodySystem : SharedBodySystem
-{
-    [Dependency] private readonly MarkingManager _markingManager = default!;
-
-    private void ApplyMarkingToPart(MarkingPrototype markingPrototype,
-        IReadOnlyList<Color>? colors,
-        bool visible,
-        SpriteComponent sprite)
-    {
-        for (var j = 0; j < markingPrototype.Sprites.Count; j++)
-        {
-            var markingSprite = markingPrototype.Sprites[j];
-
-            if (markingSprite is not SpriteSpecifier.Rsi rsi)
-                continue;
-
-            var layerId = $"{markingPrototype.ID}-{rsi.RsiState}";
-
-            if (!sprite.LayerMapTryGet(layerId, out _))
-            {
-                var layer = sprite.AddLayer(markingSprite, j + 1);
-                sprite.LayerMapSet(layerId, layer);
-                sprite.LayerSetSprite(layerId, rsi);
-            }
-
-            sprite.LayerSetVisible(layerId, visible);
-
-            if (!visible)
-                continue;
-
-            // Okay so if the marking prototype is modified but we load old marking data this may no longer be valid
-            // and we need to check the index is correct. So if that happens just default to white?
-            if (colors != null && j < colors.Count)
-                sprite.LayerSetColor(layerId, colors[j]);
-            else
-                sprite.LayerSetColor(layerId, Color.White);
-        }
-    }
-
-    protected override void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component)
-    {
-        if (!TryComp(target, out SpriteComponent? sprite))
-            return;
-
-        if (component.Color != null)
-            sprite.Color = component.Color.Value;
-
-        foreach (var (visualLayer, markingList) in component.Markings)
-            foreach (var marking in markingList)
-            {
-                if (!_markingManager.TryGetMarking(marking, out var markingPrototype))
-                    continue;
-
-                ApplyMarkingToPart(markingPrototype, marking.MarkingColors, marking.Visible, sprite);
-            }
-    }
-
-    protected override void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance)
-    {
-        return;
-    }
-}
diff --git a/Content.Client/_CorvaxNext/Body/Components/BrainComponent.cs b/Content.Client/_CorvaxNext/Body/Components/BrainComponent.cs
deleted file mode 100644
index 41846ae38ff..00000000000
--- a/Content.Client/_CorvaxNext/Body/Components/BrainComponent.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Client._CorvaxNext.Body.Components;
-
-[RegisterComponent]
-public sealed partial class BrainComponent : Component;
diff --git a/Content.Client/_CorvaxNext/Body/Components/LungComponent.cs b/Content.Client/_CorvaxNext/Body/Components/LungComponent.cs
deleted file mode 100644
index ad5dbc8c48a..00000000000
--- a/Content.Client/_CorvaxNext/Body/Components/LungComponent.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Client._CorvaxNext.Body.Components;
-
-[RegisterComponent]
-public sealed partial class LungComponent : Component;
diff --git a/Content.Client/_CorvaxNext/Body/Components/StomachComponent.cs b/Content.Client/_CorvaxNext/Body/Components/StomachComponent.cs
deleted file mode 100644
index a960d4be298..00000000000
--- a/Content.Client/_CorvaxNext/Body/Components/StomachComponent.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Client._CorvaxNext.Body.Components;
-
-[RegisterComponent]
-public sealed partial class StomachComponent : Component;
diff --git a/Content.Client/_CorvaxNext/Overlays/Shaders/SaturationScaleOverlay.cs b/Content.Client/_CorvaxNext/Overlays/Shaders/SaturationScaleOverlay.cs
deleted file mode 100644
index 644f998cbbe..00000000000
--- a/Content.Client/_CorvaxNext/Overlays/Shaders/SaturationScaleOverlay.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Numerics;
-using Content.Shared._CorvaxNext.Overlays;
-using Robust.Client.Graphics;
-using Robust.Client.Player;
-using Robust.Shared.Enums;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client._CorvaxNext.Overlays.Shaders;
-
-public sealed class SaturationScaleOverlay : Overlay
-{
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] IEntityManager _entityManager = default!;
-
-    public override bool RequestScreenTexture => true;
-    public override OverlaySpace Space => OverlaySpace.WorldSpace;
-    private readonly ShaderInstance _shader;
-    private const float Saturation = 0.5f;
-
-
-    public SaturationScaleOverlay()
-    {
-        IoCManager.InjectDependencies(this);
-
-        _shader = _prototypeManager.Index<ShaderPrototype>("SaturationScale").Instance().Duplicate();
-    }
-
-    protected override bool BeforeDraw(in OverlayDrawArgs args)
-    {
-        if (_playerManager.LocalEntity is not { Valid: true } player
-            || !_entityManager.HasComponent<SaturationScaleOverlayComponent>(player))
-            return false;
-
-        return base.BeforeDraw(in args);
-    }
-
-
-    protected override void Draw(in OverlayDrawArgs args)
-    {
-        if (ScreenTexture is null)
-            return;
-
-        _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
-        _shader.SetParameter("saturation", Saturation);
-
-        var handle = args.WorldHandle;
-        handle.SetTransform(Matrix3x2.Identity);
-        handle.UseShader(_shader);
-        handle.DrawRect(args.WorldBounds, Color.White);
-        handle.UseShader(null);
-    }
-}
diff --git a/Content.Client/_CorvaxNext/Overlays/Systems/SaturationScaleSystem.cs b/Content.Client/_CorvaxNext/Overlays/Systems/SaturationScaleSystem.cs
deleted file mode 100644
index 37a69e08940..00000000000
--- a/Content.Client/_CorvaxNext/Overlays/Systems/SaturationScaleSystem.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Content.Client._CorvaxNext.Overlays.Shaders;
-using Content.Shared._CorvaxNext.Overlays;
-using Content.Shared.GameTicking;
-using Robust.Client.Graphics;
-using Robust.Shared.Player;
-
-namespace Content.Client._CorvaxNext.Overlays.Systems;
-
-public sealed class SaturationScaleSystem : EntitySystem
-{
-    [Dependency] private readonly IOverlayManager _overlayMan = default!;
-    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
-
-    private SaturationScaleOverlay _overlay = default!;
-
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _overlay = new();
-
-        SubscribeLocalEvent<SaturationScaleOverlayComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<SaturationScaleOverlayComponent, ComponentShutdown>(OnShutdown);
-
-        SubscribeLocalEvent<SaturationScaleOverlayComponent, PlayerAttachedEvent>(OnPlayerAttached);
-        SubscribeLocalEvent<SaturationScaleOverlayComponent, PlayerDetachedEvent>(OnPlayerDetached);
-
-        SubscribeNetworkEvent<RoundRestartCleanupEvent>(RoundRestartCleanup);
-    }
-
-
-    private void RoundRestartCleanup(RoundRestartCleanupEvent ev)
-    {
-        _overlayMan.RemoveOverlay(_overlay);
-    }
-
-    private void OnPlayerDetached(EntityUid uid, SaturationScaleOverlayComponent component, PlayerDetachedEvent args)
-    {
-        _overlayMan.RemoveOverlay(_overlay);
-    }
-
-    private void OnPlayerAttached(EntityUid uid, SaturationScaleOverlayComponent component, PlayerAttachedEvent args)
-    {
-        _overlayMan.AddOverlay(_overlay);
-    }
-
-    private void OnShutdown(EntityUid uid, SaturationScaleOverlayComponent component, ComponentShutdown args)
-    {
-        if (uid != _playerMan.LocalEntity)
-            return;
-
-        _overlayMan.RemoveOverlay(_overlay);
-    }
-
-    private void OnInit(EntityUid uid, SaturationScaleOverlayComponent component, ComponentInit args)
-    {
-        if (uid != _playerMan.LocalEntity)
-            return;
-
-        _overlayMan.AddOverlay(_overlay);
-    }
-}
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryBui.cs b/Content.Client/_CorvaxNext/Surgery/SurgeryBui.cs
deleted file mode 100644
index c851ce5162e..00000000000
--- a/Content.Client/_CorvaxNext/Surgery/SurgeryBui.cs
+++ /dev/null
@@ -1,360 +0,0 @@
-using Content.Client.Xenonids.UI;
-using Content.Client.Administration.UI.CustomControls;
-using Content.Shared._CorvaxNext.Surgery;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Client.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Client._CorvaxNext.Surgery;
-
-[UsedImplicitly]
-public sealed class SurgeryBui : BoundUserInterface
-{
-    [Dependency] private readonly IEntityManager _entities = default!;
-    [Dependency] private readonly IPlayerManager _player = default!;
-
-    private readonly SurgerySystem _system;
-    [ViewVariables]
-    private SurgeryWindow? _window;
-    private EntityUid? _part;
-    private bool _isBody;
-    private (EntityUid Ent, EntProtoId Proto)? _surgery;
-    private readonly List<EntProtoId> _previousSurgeries = new();
-    public SurgeryBui(EntityUid owner, Enum uiKey) : base(owner, uiKey) => _system = _entities.System<SurgerySystem>();
-
-    protected override void ReceiveMessage(BoundUserInterfaceMessage message)
-    {
-        if (_window is null
-            || message is not SurgeryBuiRefreshMessage)
-            return;
-
-        RefreshUI();
-    }
-
-    protected override void UpdateState(BoundUserInterfaceState state)
-    {
-        if (state is not SurgeryBuiState s)
-            return;
-
-        Update(s);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-            _window?.Dispose();
-    }
-
-    private void Update(SurgeryBuiState state)
-    {
-        if (!_entities.TryGetComponent(_player.LocalEntity, out SurgeryTargetComponent? surgeryTargetComp)
-            || !surgeryTargetComp.CanOperate)
-            return;
-        if (_window == null)
-        {
-            _window = new SurgeryWindow();
-            _window.OnClose += Close;
-            _window.Title = Loc.GetString("surgery-ui-window-title");
-
-            _window.PartsButton.OnPressed += _ =>
-            {
-                _part = null;
-                _isBody = false;
-                _surgery = null;
-                _previousSurgeries.Clear();
-                View(ViewType.Parts);
-            };
-
-            _window.SurgeriesButton.OnPressed += _ =>
-            {
-                _surgery = null;
-                _previousSurgeries.Clear();
-
-                if (!_entities.TryGetNetEntity(_part, out var netPart)
-                    || State is not SurgeryBuiState s
-                    || !s.Choices.TryGetValue(netPart.Value, out var surgeries))
-                    return;
-
-                OnPartPressed(netPart.Value, surgeries);
-            };
-
-            _window.StepsButton.OnPressed += _ =>
-            {
-                if (!_entities.TryGetNetEntity(_part, out var netPart)
-                    || _previousSurgeries.Count == 0)
-                    return;
-
-                var last = _previousSurgeries[^1];
-                _previousSurgeries.RemoveAt(_previousSurgeries.Count - 1);
-
-                if (_system.GetSingleton(last) is not { } previousId
-                    || !_entities.TryGetComponent(previousId, out SurgeryComponent? previous))
-                    return;
-
-                OnSurgeryPressed((previousId, previous), netPart.Value, last);
-            };
-        }
-
-        _window.Surgeries.DisposeAllChildren();
-        _window.Steps.DisposeAllChildren();
-        _window.Parts.DisposeAllChildren();
-        View(ViewType.Parts);
-
-        var oldSurgery = _surgery;
-        var oldPart = _part;
-        _part = null;
-        _surgery = null;
-
-        var options = new List<(NetEntity netEntity, EntityUid entity, string Name, BodyPartType? PartType)>();
-        foreach (var choice in state.Choices.Keys)
-            if (_entities.TryGetEntity(choice, out var ent))
-            {
-                if (_entities.TryGetComponent(ent, out BodyPartComponent? part))
-                    options.Add((choice, ent.Value, _entities.GetComponent<MetaDataComponent>(ent.Value).EntityName, part.PartType));
-                else if (_entities.TryGetComponent(ent, out BodyComponent? body))
-                    options.Add((choice, ent.Value, _entities.GetComponent<MetaDataComponent>(ent.Value).EntityName, null));
-            }
-
-        options.Sort((a, b) =>
-        {
-            int GetScore(BodyPartType? partType)
-            {
-                return partType switch
-                {
-                    BodyPartType.Head => 1,
-                    BodyPartType.Torso => 2,
-                    BodyPartType.Arm => 3,
-                    BodyPartType.Hand => 4,
-                    BodyPartType.Leg => 5,
-                    BodyPartType.Foot => 6,
-                    // BodyPartType.Tail => 7, No tails yet!
-                    BodyPartType.Other => 8,
-                    _ => 9
-                };
-            }
-
-            return GetScore(a.PartType) - GetScore(b.PartType);
-        });
-
-        foreach (var (netEntity, entity, partName, _) in options)
-        {
-            //var netPart = _entities.GetNetEntity(part.Owner);
-            var surgeries = state.Choices[netEntity];
-            var partButton = new XenoChoiceControl();
-
-            partButton.Set(partName, null);
-            partButton.Button.OnPressed += _ => OnPartPressed(netEntity, surgeries);
-
-            _window.Parts.AddChild(partButton);
-
-            foreach (var surgeryId in surgeries)
-            {
-                if (_system.GetSingleton(surgeryId) is not { } surgery ||
-                    !_entities.TryGetComponent(surgery, out SurgeryComponent? surgeryComp))
-                    continue;
-
-                if (oldPart == entity && oldSurgery?.Proto == surgeryId)
-                    OnSurgeryPressed((surgery, surgeryComp), netEntity, surgeryId);
-            }
-
-            if (oldPart == entity && oldSurgery == null)
-                OnPartPressed(netEntity, surgeries);
-        }
-
-
-        if (!_window.IsOpen)
-        {
-            //Logger.Debug("Attempting to open");
-            _window.OpenCentered();
-        }
-    }
-
-    private void AddStep(EntProtoId stepId, NetEntity netPart, EntProtoId surgeryId)
-    {
-        if (_window == null
-            || _system.GetSingleton(stepId) is not { } step)
-            return;
-
-        var stepName = new FormattedMessage();
-        stepName.AddText(_entities.GetComponent<MetaDataComponent>(step).EntityName);
-        var stepButton = new SurgeryStepButton { Step = step };
-        stepButton.Button.OnPressed += _ => SendMessage(new SurgeryStepChosenBuiMsg(netPart, surgeryId, stepId, _isBody));
-
-        _window.Steps.AddChild(stepButton);
-    }
-
-    private void OnSurgeryPressed(Entity<SurgeryComponent> surgery, NetEntity netPart, EntProtoId surgeryId)
-    {
-        if (_window == null)
-            return;
-
-        _part = _entities.GetEntity(netPart);
-        _isBody = _entities.HasComponent<BodyComponent>(_part);
-        _surgery = (surgery, surgeryId);
-
-        _window.Steps.DisposeAllChildren();
-
-        // This apparently does not consider if theres multiple surgery requirements in one surgery. Maybe thats fine.
-        if (surgery.Comp.Requirement is { } requirementId && _system.GetSingleton(requirementId) is { } requirement)
-        {
-            var label = new XenoChoiceControl();
-            label.Button.OnPressed += _ =>
-            {
-                _previousSurgeries.Add(surgeryId);
-
-                if (_entities.TryGetComponent(requirement, out SurgeryComponent? requirementComp))
-                    OnSurgeryPressed((requirement, requirementComp), netPart, requirementId);
-            };
-
-            var msg = new FormattedMessage();
-            var surgeryName = _entities.GetComponent<MetaDataComponent>(requirement).EntityName;
-            msg.AddMarkup($"[bold]{Loc.GetString("surgery-ui-window-require")}: {surgeryName}[/bold]");
-            label.Set(msg, null);
-
-            _window.Steps.AddChild(label);
-            _window.Steps.AddChild(new HSeparator { Margin = new Thickness(0, 0, 0, 1) });
-        }
-        foreach (var stepId in surgery.Comp.Steps)
-            AddStep(stepId, netPart, surgeryId);
-
-        View(ViewType.Steps);
-        RefreshUI();
-    }
-
-    private void OnPartPressed(NetEntity netPart, List<EntProtoId> surgeryIds)
-    {
-        if (_window == null)
-            return;
-
-        _part = _entities.GetEntity(netPart);
-        _isBody = _entities.HasComponent<BodyComponent>(_part);
-        _window.Surgeries.DisposeAllChildren();
-
-        var surgeries = new List<(Entity<SurgeryComponent> Ent, EntProtoId Id, string Name)>();
-        foreach (var surgeryId in surgeryIds)
-        {
-            if (_system.GetSingleton(surgeryId) is not { } surgery ||
-                !_entities.TryGetComponent(surgery, out SurgeryComponent? surgeryComp))
-            {
-                continue;
-            }
-
-            var name = _entities.GetComponent<MetaDataComponent>(surgery).EntityName;
-            surgeries.Add(((surgery, surgeryComp), surgeryId, name));
-        }
-
-        surgeries.Sort((a, b) =>
-        {
-            var priority = a.Ent.Comp.Priority.CompareTo(b.Ent.Comp.Priority);
-            if (priority != 0)
-                return priority;
-
-            return string.Compare(a.Name, b.Name, StringComparison.Ordinal);
-        });
-
-        foreach (var surgery in surgeries)
-        {
-            var surgeryButton = new XenoChoiceControl();
-            surgeryButton.Set(surgery.Name, null);
-
-            surgeryButton.Button.OnPressed += _ => OnSurgeryPressed(surgery.Ent, netPart, surgery.Id);
-            _window.Surgeries.AddChild(surgeryButton);
-        }
-
-        RefreshUI();
-        View(ViewType.Surgeries);
-    }
-
-    private void RefreshUI()
-    {
-        if (_window == null
-            || !_window.IsOpen
-            || _part == null
-            || !_entities.HasComponent<SurgeryComponent>(_surgery?.Ent)
-            || !_entities.TryGetComponent(_player.LocalEntity ?? EntityUid.Invalid, out SurgeryTargetComponent? surgeryComp)
-            || !surgeryComp.CanOperate)
-            return;
-
-        var next = _system.GetNextStep(Owner, _part.Value, _surgery.Value.Ent);
-        var i = 0;
-        foreach (var child in _window.Steps.Children)
-        {
-            if (child is not SurgeryStepButton stepButton)
-                continue;
-
-            var status = StepStatus.Incomplete;
-            if (next == null)
-                status = StepStatus.Complete;
-            else if (next.Value.Surgery.Owner != _surgery.Value.Ent)
-                status = StepStatus.Incomplete;
-            else if (next.Value.Step == i)
-                status = StepStatus.Next;
-            else if (i < next.Value.Step)
-                status = StepStatus.Complete;
-
-            stepButton.Button.Disabled = status != StepStatus.Next;
-
-            var stepName = new FormattedMessage();
-            stepName.AddText(_entities.GetComponent<MetaDataComponent>(stepButton.Step).EntityName);
-
-            if (status == StepStatus.Complete)
-                stepButton.Button.Modulate = Color.Green;
-            else
-            {
-                stepButton.Button.Modulate = Color.White;
-                if (_player.LocalEntity is { } player
-                    && status == StepStatus.Next
-                    && !_system.CanPerformStep(player, Owner, _part.Value, stepButton.Step, false, out var popup, out var reason, out _))
-                    stepButton.ToolTip = popup;
-            }
-
-            var texture = _entities.GetComponentOrNull<SpriteComponent>(stepButton.Step)?.Icon?.Default;
-            stepButton.Set(stepName, texture);
-            i++;
-        }
-    }
-
-    private void View(ViewType type)
-    {
-        if (_window == null)
-            return;
-
-        _window.PartsButton.Parent!.Margin = new Thickness(0, 0, 0, 10);
-
-        _window.Parts.Visible = type == ViewType.Parts;
-        _window.PartsButton.Disabled = type == ViewType.Parts;
-
-        _window.Surgeries.Visible = type == ViewType.Surgeries;
-        _window.SurgeriesButton.Disabled = type != ViewType.Steps;
-
-        _window.Steps.Visible = type == ViewType.Steps;
-        _window.StepsButton.Disabled = type != ViewType.Steps || _previousSurgeries.Count == 0;
-
-        if (_entities.TryGetComponent(_part, out MetaDataComponent? partMeta) &&
-            _entities.TryGetComponent(_surgery?.Ent, out MetaDataComponent? surgeryMeta))
-            _window.Title = $"Surgery - {partMeta.EntityName}, {surgeryMeta.EntityName}";
-        else if (partMeta != null)
-            _window.Title = $"Surgery - {partMeta.EntityName}";
-        else
-            _window.Title = "Surgery";
-    }
-
-    private enum ViewType
-    {
-        Parts,
-        Surgeries,
-        Steps
-    }
-
-    private enum StepStatus
-    {
-        Next,
-        Complete,
-        Incomplete
-    }
-}
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml b/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml
deleted file mode 100644
index d7878fb6572..00000000000
--- a/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml
+++ /dev/null
@@ -1,4 +0,0 @@
-<surgery:SurgeryStepButton
-    xmlns="https://spacestation14.io"
-    xmlns:surgery="clr-namespace:Content.Client._CorvaxNext.Surgery">
-</surgery:SurgeryStepButton>
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml.cs b/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml.cs
deleted file mode 100644
index c4b90e6e154..00000000000
--- a/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Client.Xenonids.UI;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._CorvaxNext.Surgery;
-
-[GenerateTypedNameReferences]
-public sealed partial class SurgeryStepButton : XenoChoiceControl
-{
-    public EntityUid Step { get; set; }
-
-    public SurgeryStepButton()
-    {
-        RobustXamlLoader.Load(this);
-    }
-}
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgerySystem.cs b/Content.Client/_CorvaxNext/Surgery/SurgerySystem.cs
deleted file mode 100644
index bc4c51dc519..00000000000
--- a/Content.Client/_CorvaxNext/Surgery/SurgerySystem.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Shared._CorvaxNext.Surgery;
-
-namespace Content.Client._CorvaxNext.Surgery;
-
-public sealed class SurgerySystem : SharedSurgerySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-    }
-}
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml b/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml
deleted file mode 100644
index e3842228773..00000000000
--- a/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-<controls:SurgeryWindow
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client._CorvaxNext.Surgery"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-    MinSize="400 400">
-    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 0 0 10">
-            <Button Name="PartsButton" Access="Public" Text="{Loc 'surgery-ui-window-parts'}"
-                    HorizontalExpand="True" StyleClasses="OpenBoth" />
-            <Button Name="SurgeriesButton" Access="Public" Text="{Loc 'surgery-ui-window-surgeries'}"
-                    HorizontalExpand="True" StyleClasses="OpenBoth" />
-            <Button Name="StepsButton" Access="Public" Text="{Loc 'surgery-ui-window-steps'}"
-                    HorizontalExpand="True" StyleClasses="OpenBoth" />
-        </BoxContainer>
-        <cc:HSeparator />
-        <ScrollContainer VScrollEnabled="True" HorizontalExpand="True" VerticalExpand="True">
-            <BoxContainer Name="Parts" Access="Public" Orientation="Vertical" Visible="False" />
-            <BoxContainer Name="Surgeries" Access="Public" Orientation="Vertical" Visible="False" />
-            <BoxContainer Name="Steps" Access="Public" Orientation="Vertical" Visible="False" />
-        </ScrollContainer>
-    </BoxContainer>
-</controls:SurgeryWindow>
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml.cs b/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml.cs
deleted file mode 100644
index 84f13cb7784..00000000000
--- a/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._CorvaxNext.Surgery;
-
-[GenerateTypedNameReferences]
-public sealed partial class SurgeryWindow : DefaultWindow
-{
-    public SurgeryWindow()
-    {
-        RobustXamlLoader.Load(this);
-    }
-}
diff --git a/Content.Client/_CorvaxNext/Targeting/TargetingSystem.cs b/Content.Client/_CorvaxNext/Targeting/TargetingSystem.cs
deleted file mode 100644
index d339f3e65e2..00000000000
--- a/Content.Client/_CorvaxNext/Targeting/TargetingSystem.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using Content.Shared._CorvaxNext.Targeting;
-using Content.Shared.Input;
-using Robust.Client.Player;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Player;
-
-namespace Content.Client._CorvaxNext.Targeting;
-public sealed class TargetingSystem : SharedTargetingSystem
-{
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-
-    public event Action<TargetingComponent>? TargetingStartup;
-    public event Action? TargetingShutdown;
-    public event Action<TargetBodyPart>? TargetChange;
-    public event Action<TargetingComponent>? PartStatusStartup;
-    public event Action<TargetingComponent>? PartStatusUpdate;
-    public event Action? PartStatusShutdown;
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<TargetingComponent, LocalPlayerAttachedEvent>(HandlePlayerAttached);
-        SubscribeLocalEvent<TargetingComponent, LocalPlayerDetachedEvent>(HandlePlayerDetached);
-        SubscribeLocalEvent<TargetingComponent, ComponentStartup>(OnTargetingStartup);
-        SubscribeLocalEvent<TargetingComponent, ComponentShutdown>(OnTargetingShutdown);
-        SubscribeNetworkEvent<TargetIntegrityChangeEvent>(OnTargetIntegrityChange);
-
-        CommandBinds.Builder
-        .Bind(ContentKeyFunctions.TargetHead,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.Head)))
-        .Bind(ContentKeyFunctions.TargetTorso,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.Torso)))
-        .Bind(ContentKeyFunctions.TargetLeftArm,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.LeftArm)))
-        .Bind(ContentKeyFunctions.TargetLeftHand,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.LeftHand)))
-        .Bind(ContentKeyFunctions.TargetRightArm,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.RightArm)))
-        .Bind(ContentKeyFunctions.TargetRightHand,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.RightHand)))
-        .Bind(ContentKeyFunctions.TargetLeftLeg,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.LeftLeg)))
-        .Bind(ContentKeyFunctions.TargetLeftFoot,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.LeftFoot)))
-        .Bind(ContentKeyFunctions.TargetRightLeg,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.RightLeg)))
-        .Bind(ContentKeyFunctions.TargetRightFoot,
-            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.RightFoot)))
-        .Register<SharedTargetingSystem>();
-    }
-
-    private void HandlePlayerAttached(EntityUid uid, TargetingComponent component, LocalPlayerAttachedEvent args)
-    {
-        TargetingStartup?.Invoke(component);
-        PartStatusStartup?.Invoke(component);
-    }
-
-    private void HandlePlayerDetached(EntityUid uid, TargetingComponent component, LocalPlayerDetachedEvent args)
-    {
-        TargetingShutdown?.Invoke();
-        PartStatusShutdown?.Invoke();
-    }
-
-    private void OnTargetingStartup(EntityUid uid, TargetingComponent component, ComponentStartup args)
-    {
-        if (_playerManager.LocalEntity != uid)
-            return;
-
-        TargetingStartup?.Invoke(component);
-        PartStatusStartup?.Invoke(component);
-    }
-
-    private void OnTargetingShutdown(EntityUid uid, TargetingComponent component, ComponentShutdown args)
-    {
-        if (_playerManager.LocalEntity != uid)
-            return;
-
-        TargetingShutdown?.Invoke();
-        PartStatusShutdown?.Invoke();
-    }
-
-    private void OnTargetIntegrityChange(TargetIntegrityChangeEvent args)
-    {
-        if (!TryGetEntity(args.Uid, out var uid)
-            || !_playerManager.LocalEntity.Equals(uid)
-            || !TryComp(uid, out TargetingComponent? component)
-            || !args.RefreshUi)
-            return;
-
-        PartStatusUpdate?.Invoke(component);
-    }
-
-    private void HandleTargetChange(ICommonSession? session, TargetBodyPart target)
-    {
-        if (session == null
-            || session.AttachedEntity is not { } uid
-            || !TryComp<TargetingComponent>(uid, out var targeting))
-            return;
-
-        TargetChange?.Invoke(target);
-    }
-}
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/PartStatusUIController.cs b/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/PartStatusUIController.cs
deleted file mode 100644
index 7a39bfa63d4..00000000000
--- a/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/PartStatusUIController.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets;
-using Content.Client.Gameplay;
-using Content.Shared._CorvaxNext.Targeting;
-using Content.Client._CorvaxNext.Targeting;
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface.Controllers;
-using Robust.Shared.Utility;
-using Robust.Client.Graphics;
-
-namespace Content.Client._CorvaxNext.UserInterface.Systems.PartStatus;
-
-public sealed class PartStatusUIController : UIController, IOnStateEntered<GameplayState>, IOnSystemChanged<TargetingSystem>
-{
-    [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IEntityNetworkManager _net = default!;
-    private SpriteSystem _spriteSystem = default!;
-    private TargetingComponent? _targetingComponent;
-    private PartStatusControl? PartStatusControl => UIManager.GetActiveUIWidgetOrNull<PartStatusControl>();
-
-    public void OnSystemLoaded(TargetingSystem system)
-    {
-        system.PartStatusStartup += AddPartStatusControl;
-        system.PartStatusShutdown += RemovePartStatusControl;
-        system.PartStatusUpdate += UpdatePartStatusControl;
-    }
-
-    public void OnSystemUnloaded(TargetingSystem system)
-    {
-        system.PartStatusStartup -= AddPartStatusControl;
-        system.PartStatusShutdown -= RemovePartStatusControl;
-        system.PartStatusUpdate -= UpdatePartStatusControl;
-    }
-
-    public void OnStateEntered(GameplayState state)
-    {
-        if (PartStatusControl != null)
-        {
-            PartStatusControl.SetVisible(_targetingComponent != null);
-
-            if (_targetingComponent != null)
-                PartStatusControl.SetTextures(_targetingComponent.BodyStatus);
-        }
-    }
-
-    public void AddPartStatusControl(TargetingComponent component)
-    {
-        _targetingComponent = component;
-
-        if (PartStatusControl != null)
-        {
-            PartStatusControl.SetVisible(_targetingComponent != null);
-
-            if (_targetingComponent != null)
-                PartStatusControl.SetTextures(_targetingComponent.BodyStatus);
-        }
-
-    }
-
-    public void RemovePartStatusControl()
-    {
-        if (PartStatusControl != null)
-            PartStatusControl.SetVisible(false);
-
-        _targetingComponent = null;
-    }
-
-    public void UpdatePartStatusControl(TargetingComponent component)
-    {
-        if (PartStatusControl != null && _targetingComponent != null)
-            PartStatusControl.SetTextures(_targetingComponent.BodyStatus);
-    }
-
-    public Texture GetTexture(SpriteSpecifier specifier)
-    {
-        if (_spriteSystem == null)
-            _spriteSystem = _entManager.System<SpriteSystem>();
-
-        return _spriteSystem.Frame0(specifier);
-    }
-}
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml b/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml
deleted file mode 100644
index 8c8a1d9e1aa..00000000000
--- a/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<widgets:PartStatusControl
-    xmlns="https://spacestation14.io"
-    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    xmlns:widgets="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets"
-    Name="PartStatusIndicator"
-    VerticalAlignment="Center"
-    HorizontalAlignment="Center">
-    <Control>
-        <PanelContainer>
-            <TextureRect
-                Name="DollHead"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollTorso"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollGroin"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollLeftArm"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollLeftHand"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollRightArm"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollRightHand"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollLeftLeg"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollLeftFoot"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollRightLeg"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-            <TextureRect
-                Name="DollRightFoot"
-                Stretch="KeepAspectCentered"
-                SetSize="64 64"/>
-        </PanelContainer>
-    </Control>
-</widgets:PartStatusControl>
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs b/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs
deleted file mode 100644
index db41ba21bcc..00000000000
--- a/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Shared._CorvaxNext.Targeting;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Utility;
-
-namespace Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets;
-
-[GenerateTypedNameReferences]
-public sealed partial class PartStatusControl : UIWidget
-{
-    private readonly Dictionary<TargetBodyPart, TextureRect> _partStatusControls;
-    private readonly PartStatusUIController _controller;
-    public PartStatusControl()
-    {
-        RobustXamlLoader.Load(this);
-
-        _controller = UserInterfaceManager.GetUIController<PartStatusUIController>();
-        _partStatusControls = new Dictionary<TargetBodyPart, TextureRect>
-        {
-            { TargetBodyPart.Head, DollHead },
-            { TargetBodyPart.Torso, DollTorso },
-            { TargetBodyPart.Groin, DollGroin },
-            { TargetBodyPart.LeftArm, DollLeftArm },
-            { TargetBodyPart.LeftHand, DollLeftHand },
-            { TargetBodyPart.RightArm, DollRightArm },
-            { TargetBodyPart.RightHand, DollRightHand },
-            { TargetBodyPart.LeftLeg, DollLeftLeg },
-            { TargetBodyPart.LeftFoot, DollLeftFoot },
-            { TargetBodyPart.RightLeg, DollRightLeg },
-            { TargetBodyPart.RightFoot, DollRightFoot }
-        };
-    }
-
-    public void SetTextures(Dictionary<TargetBodyPart, TargetIntegrity> state)
-    {
-        foreach (var (bodyPart, integrity) in state)
-        {
-            string enumName = Enum.GetName(typeof(TargetBodyPart), bodyPart) ?? "Unknown";
-            int enumValue = (int) integrity;
-            var texture = new SpriteSpecifier.Rsi(new ResPath($"/Textures/Interface/Targeting/Status/{enumName.ToLowerInvariant()}.rsi"), $"{enumName.ToLowerInvariant()}_{enumValue}");
-            _partStatusControls[bodyPart].Texture = _controller.GetTexture(texture);
-        }
-    }
-
-    public void SetVisible(bool visible) => this.Visible = visible;
-
-}
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/TargetingUIController.cs b/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/TargetingUIController.cs
deleted file mode 100644
index a435b5002b0..00000000000
--- a/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/TargetingUIController.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets;
-using Content.Client.Gameplay;
-using Content.Client._CorvaxNext.Targeting;
-using Content.Shared._CorvaxNext.Targeting;
-using Robust.Client.UserInterface.Controllers;
-using Robust.Client.Player;
-
-namespace Content.Client._CorvaxNext.UserInterface.Systems.Targeting;
-
-public sealed class TargetingUIController : UIController, IOnStateEntered<GameplayState>, IOnSystemChanged<TargetingSystem>
-{
-    [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IEntityNetworkManager _net = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-
-    private TargetingComponent? _targetingComponent;
-    private TargetingControl? TargetingControl => UIManager.GetActiveUIWidgetOrNull<TargetingControl>();
-
-    public void OnSystemLoaded(TargetingSystem system)
-    {
-        system.TargetingStartup += AddTargetingControl;
-        system.TargetingShutdown += RemoveTargetingControl;
-        system.TargetChange += CycleTarget;
-    }
-
-    public void OnSystemUnloaded(TargetingSystem system)
-    {
-        system.TargetingStartup -= AddTargetingControl;
-        system.TargetingShutdown -= RemoveTargetingControl;
-        system.TargetChange -= CycleTarget;
-    }
-
-    public void OnStateEntered(GameplayState state)
-    {
-        if (TargetingControl == null)
-            return;
-
-        TargetingControl.SetTargetDollVisible(_targetingComponent != null);
-
-        if (_targetingComponent != null)
-            TargetingControl.SetBodyPartsVisible(_targetingComponent.Target);
-    }
-
-    public void AddTargetingControl(TargetingComponent component)
-    {
-        _targetingComponent = component;
-
-        if (TargetingControl != null)
-        {
-            TargetingControl.SetTargetDollVisible(_targetingComponent != null);
-
-            if (_targetingComponent != null)
-                TargetingControl.SetBodyPartsVisible(_targetingComponent.Target);
-        }
-
-    }
-
-    public void RemoveTargetingControl()
-    {
-        if (TargetingControl != null)
-            TargetingControl.SetTargetDollVisible(false);
-
-        _targetingComponent = null;
-    }
-
-    public void CycleTarget(TargetBodyPart bodyPart)
-    {
-        if (_playerManager.LocalEntity is not { } user
-            || _entManager.GetComponent<TargetingComponent>(user) is not { } targetingComponent
-            || TargetingControl == null)
-            return;
-
-        var player = _entManager.GetNetEntity(user);
-        if (bodyPart != targetingComponent.Target)
-        {
-            var msg = new TargetChangeEvent(player, bodyPart);
-            _net.SendSystemNetworkMessage(msg);
-            TargetingControl?.SetBodyPartsVisible(bodyPart);
-        }
-    }
-}
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml b/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml
deleted file mode 100644
index 5d7b1becfac..00000000000
--- a/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml
+++ /dev/null
@@ -1,218 +0,0 @@
-<widgets:TargetingControl
-    xmlns="https://spacestation14.io"
-    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    xmlns:widgets="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets"
-    Name="TargetingButton"
-    VerticalExpand="True"
-    VerticalAlignment="Bottom"
-    HorizontalAlignment="Right">
-    <Control HorizontalAlignment="Right">
-        <TextureRect
-            Name="TargetDoll"
-            Stretch="KeepAspectCentered"
-            SetSize="96 96">
-            <PanelContainer
-                SetSize="57 96"
-                Margin="18 0 0 0"
-                VerticalAlignment="Bottom"
-                HorizontalAlignment="Left">
-                <PanelContainer
-                    SetSize="18 39"
-                    Margin="0 7 0 0"
-                    HorizontalAlignment="Left">
-                    <TextureButton
-                        Name="RightArmButton"
-                        MinSize="18 30"
-                        StyleClasses="TargetDollButtonRightArm"
-                        VerticalAlignment="Top">
-                        <TextureRect
-                            TexturePath="/Textures/Interface/Targeting/Doll/rightarm.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="12 24"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                    <TextureButton
-                        Name="RightHandButton"
-                        MinSize="18 18"
-                        VerticalAlignment="Bottom"
-                        StyleClasses="TargetDollButtonRightHand">
-                        <TextureRect
-                            TexturePath="/Textures/Interface/Targeting/Doll/righthand.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="12 12"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                </PanelContainer>
-                <PanelContainer
-                    SetSize="51 90"
-                    Margin="0 64 0 0"
-                    VerticalAlignment="Bottom"
-                    HorizontalAlignment="Center">
-                    <TextureButton
-                        Name="HeadButton"
-                        MinSize="33 27"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Center"
-                        StyleClasses="TargetDollButtonHead">
-                        <TextureRect
-                            TexturePath="/Textures/Interface/Targeting/Doll/head.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="27 21"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                        <!--<PanelContainer
-                            SetSize="15 15"
-                            Margin="0 9 0 0"
-                            HorizontalAlignment="Center">
-                            <TextureButton
-                                Name="EyesButton"
-                                MinSize="15 9"
-                                VerticalAlignment="Top"
-                                StyleClasses="TargetDollButtonEyes">
-                                <TextureRect
-                                    TexturePath="/Textures/Interface/Targeting/Doll/eyes.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="15 9"/>
-                            </TextureButton>
-                            <TextureButton
-                                Name="MouthButton"
-                                SetSize="9 6"
-                                VerticalAlignment="Bottom"
-                                StyleClasses="TargetDollButtonMouth">
-                                <TextureRect
-                                    TexturePath="/Textures/Interface/Targeting/Doll/mouth.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="9 6"/>
-                            </TextureButton>
-                        </PanelContainer>-->
-                    </TextureButton>
-                    <TextureButton
-                        Name="ChestButton"
-                        SetSize="33 36"
-                        Margin="0 21 0 0"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Center"
-                        StyleClasses="TargetDollButtonChest">
-                        <TextureRect
-                            TexturePath="/Textures/Interface/Targeting/Doll/torso.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="27 30"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                    <PanelContainer
-                        MinSize="45 42"
-                        VerticalAlignment="Bottom"
-                        HorizontalAlignment="Center">
-                        <TextureButton
-                            Name="GroinButton"
-                            MinSize="33 18"
-                            VerticalAlignment="Top"
-                            HorizontalAlignment="Center"
-                            StyleClasses="TargetDollButtonGroin">
-                            <TextureRect
-                                TexturePath="/Textures/Interface/Targeting/Doll/groin.png"
-                                Stretch="KeepAspectCentered"
-                                SetSize="27 12"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center"/>
-                        </TextureButton>
-                        <PanelContainer
-                            MinSize="24 36"
-                            VerticalAlignment="Bottom"
-                            HorizontalAlignment="Right">
-                            <TextureButton
-                                Name="LeftLegButton"
-                                MinSize="18 33"
-                                VerticalAlignment="Top"
-                                HorizontalAlignment="Left"
-                                StyleClasses="TargetDollButtonLeftLeg">
-                                <TextureRect
-                                    TexturePath="/Textures/Interface/Targeting/Doll/leftleg.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="12 27"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"/>
-                            </TextureButton>
-                            <TextureButton
-                                Name="LeftFootButton"
-                                MinSize="24 12"
-                                VerticalAlignment="Bottom"
-                                StyleClasses="TargetDollButtonLeftFoot">
-                                    <TextureRect
-                                        TexturePath="/Textures/Interface/Targeting/Doll/leftfoot.png"
-                                        Stretch="KeepAspectCentered"
-                                        SetSize="18 9"
-                                        VerticalAlignment="Center"
-                                        HorizontalAlignment="Center"/>
-                            </TextureButton>
-                        </PanelContainer>
-                        <PanelContainer
-                            MinSize="24 36"
-                            VerticalAlignment="Bottom"
-                            HorizontalAlignment="Left">
-                            <TextureButton
-                                Name="RightLegButton"
-                                MinSize="18 33"
-                                VerticalAlignment="Top"
-                                HorizontalAlignment="Right"
-                                StyleClasses="TargetDollButtonRightLeg">
-                                <TextureRect
-                                    TexturePath="/Textures/Interface/Targeting/Doll/rightleg.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="12 27"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"/>
-                            </TextureButton>
-                            <TextureButton
-                                Name="RightFootButton"
-                                MinSize="24 12"
-                                VerticalAlignment="Bottom"
-                                HorizontalAlignment="Center"
-                                StyleClasses="TargetDollButtonRightFoot">
-                                <TextureRect
-                                    TexturePath="/Textures/Interface/Targeting/Doll/rightfoot.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="18 9"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"/>
-                            </TextureButton>
-                        </PanelContainer>
-                    </PanelContainer>
-                </PanelContainer>
-                <PanelContainer
-                    SetSize="18 39"
-                    Margin="0 7 0 0"
-                    HorizontalAlignment="Right">
-                    <TextureButton
-                        Name="LeftArmButton"
-                        MinSize="18 30"
-                        StyleClasses="TargetDollButtonLeftArm"
-                        VerticalAlignment="Top">
-                        <TextureRect
-                            TexturePath="/Textures/Interface/Targeting/Doll/leftarm.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="12 24"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                    <TextureButton
-                        Name="LeftHandButton"
-                        MinSize="18 18"
-                        VerticalAlignment="Bottom"
-                        StyleClasses="TargetDollButtonLeftHand">
-                        <TextureRect
-                            TexturePath="/Textures/Interface/Targeting/Doll/lefthand.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="12 12"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                </PanelContainer>
-            </PanelContainer>
-        </TextureRect>
-    </Control>
-</widgets:TargetingControl>
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs b/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs
deleted file mode 100644
index f1853d6eeb7..00000000000
--- a/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Linq;
-using Content.Shared._CorvaxNext.Targeting;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets;
-
-[GenerateTypedNameReferences]
-public sealed partial class TargetingControl : UIWidget
-{
-    private readonly TargetingUIController _controller;
-    private readonly Dictionary<TargetBodyPart, TextureButton> _bodyPartControls;
-
-    public TargetingControl()
-    {
-        RobustXamlLoader.Load(this);
-        _controller = UserInterfaceManager.GetUIController<TargetingUIController>();
-
-        _bodyPartControls = new Dictionary<TargetBodyPart, TextureButton>
-        {
-            // TODO: ADD EYE AND MOUTH TARGETING
-            { TargetBodyPart.Head, HeadButton },
-            { TargetBodyPart.Torso, ChestButton },
-            { TargetBodyPart.Groin, GroinButton },
-            { TargetBodyPart.LeftArm, LeftArmButton },
-            { TargetBodyPart.LeftHand, LeftHandButton },
-            { TargetBodyPart.RightArm, RightArmButton },
-            { TargetBodyPart.RightHand, RightHandButton },
-            { TargetBodyPart.LeftLeg, LeftLegButton },
-            { TargetBodyPart.LeftFoot, LeftFootButton },
-            { TargetBodyPart.RightLeg, RightLegButton },
-            { TargetBodyPart.RightFoot, RightFootButton },
-        };
-
-        foreach (var bodyPartButton in _bodyPartControls)
-        {
-            bodyPartButton.Value.MouseFilter = MouseFilterMode.Stop;
-            bodyPartButton.Value.OnPressed += _ => SetActiveBodyPart(bodyPartButton.Key);
-
-            TargetDoll.Texture = Theme.ResolveTexture("target_doll");
-        }
-    }
-
-    private void SetActiveBodyPart(TargetBodyPart bodyPart) => _controller.CycleTarget(bodyPart);
-
-    public void SetBodyPartsVisible(TargetBodyPart bodyPart)
-    {
-        foreach (var bodyPartButton in _bodyPartControls)
-            bodyPartButton.Value.Children.First().Visible = bodyPartButton.Key == bodyPart;
-    }
-
-    protected override void OnThemeUpdated() => TargetDoll.Texture = Theme.ResolveTexture("target_doll");
-
-    public void SetTargetDollVisible(bool visible) => Visible = visible;
-
-}
diff --git a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
index d4fad0dde91..7bc62dfe2bc 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
@@ -34,7 +34,7 @@ public async Task DeleteAllThenGhost()
             Console.WriteLine(pair.Client.EntMan.ToPrettyString(ent));
         }
 
-        Assert.That(pair.Client.EntMan.EntityCount, Is.AtMost(1)); // Corvax-Next-Surgery: Tolerate at most one client entity
+        Assert.That(pair.Client.EntMan.EntityCount, Is.EqualTo(0));
 
         // Create a new map.
         int mapId = 1;
diff --git a/Content.IntegrationTests/Tests/Movement/SlippingTest.cs b/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
index 9b6c1a1bbbe..7ee895d7c27 100644
--- a/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
+++ b/Content.IntegrationTests/Tests/Movement/SlippingTest.cs
@@ -31,11 +31,9 @@ public async Task BananaSlipTest()
     {
         var sys = SEntMan.System<SlipTestSystem>();
         await SpawnTarget("TrashBananaPeel");
-		
-		// Corvax-Next-Surgery-Start
-        // var modifier = Comp<MovementSpeedModifierComponent>(Player).SprintSpeedModifier;
-        // Assert.That(modifier, Is.EqualTo(1), "Player is not moving at full speed."); Yeeting this pointless Assert because it's not actually important.
-		// Corvax-Next-Surgery-End
+
+        var modifier = Comp<MovementSpeedModifierComponent>(Player).SprintSpeedModifier;
+        Assert.That(modifier, Is.EqualTo(1), "Player is not moving at full speed.");
 
         // Player is to the left of the banana peel and has not slipped.
         Assert.That(Delta(), Is.GreaterThan(0.5f));
diff --git a/Content.Server/Arcade/BlockGame/BlockGame.cs b/Content.Server/Arcade/BlockGame/BlockGame.cs
index 8bfd065dcd5..82063b6443f 100644
--- a/Content.Server/Arcade/BlockGame/BlockGame.cs
+++ b/Content.Server/Arcade/BlockGame/BlockGame.cs
@@ -2,7 +2,6 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Random;
 using System.Linq;
-using Content.Shared._CorvaxNext.Mood;
 
 namespace Content.Server.Arcade.BlockGame;
 
@@ -83,8 +82,6 @@ private void InvokeGameover()
         {
             _highScorePlacement = _arcadeSystem.RegisterHighScore(meta.EntityName, Points);
             SendHighscoreUpdate();
-            var ev = new MoodEffectEvent("ArcadePlay"); // Corvax-Next-Mood
-            _entityManager.EventBus.RaiseLocalEvent(meta.Owner, ev); // Corvax-Next-Mood
         }
         SendMessage(new BlockGameMessages.BlockGameGameOverScreenMessage(Points, _highScorePlacement?.LocalPlacement, _highScorePlacement?.GlobalPlacement));
     }
diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
index 26991f39ef5..b359a13bd12 100644
--- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
+++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
@@ -3,7 +3,6 @@
 using Content.Server.Advertise;
 using Content.Server.Advertise.Components;
 using Content.Shared.Power;
-using Content.Shared._CorvaxNext.Mood;
 using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -78,8 +77,6 @@ private void OnSVPlayerAction(EntityUid uid, SpaceVillainArcadeComponent compone
         if (!TryComp<ApcPowerReceiverComponent>(uid, out var power) || !power.Powered)
             return;
 
-        RaiseLocalEvent(msg.Actor, new MoodEffectEvent("ArcadePlay")); // _CorvaxNext: mood
-
         switch (msg.PlayerAction)
         {
             case PlayerAction.Attack:
diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
index d2de8197f0d..ec508790ba8 100644
--- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
@@ -8,7 +8,6 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
-using Content.Shared._CorvaxNext.Mood;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Atmos.EntitySystems
@@ -238,13 +237,14 @@ public override void Update(float frameTime)
                 if (pressure <= Atmospherics.HazardLowPressure)
                 {
                     // Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
-                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true, false, canSever: false); // CorvaxNext
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true, false);
+
                     if (!barotrauma.TakingDamage)
                     {
                         barotrauma.TakingDamage = true;
                         _adminLogger.Add(LogType.Barotrauma, $"{ToPrettyString(uid):entity} started taking low pressure damage");
                     }
-                    RaiseLocalEvent(uid, new MoodEffectEvent("MobLowPressure")); // Corvax Next
+
                     _alertsSystem.ShowAlert(uid, barotrauma.LowPressureAlert, 2);
                 }
                 else if (pressure >= Atmospherics.HazardHighPressure)
@@ -252,8 +252,7 @@ public override void Update(float frameTime)
                     var damageScale = MathF.Min(((pressure / Atmospherics.HazardHighPressure) - 1) * Atmospherics.PressureDamageCoefficient, Atmospherics.MaxHighPressureDamage);
 
                     // Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
-                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false, canSever: false); // Corvax Next
-                    RaiseLocalEvent(uid, new MoodEffectEvent("MobHighPressure")); // Corvax Next
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false);
 
                     if (!barotrauma.TakingDamage)
                     {
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 5c1f944b1ae..bc96807af2d 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -24,7 +24,6 @@
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.FixedPoint;
 using Robust.Server.Audio;
-using Content.Shared._CorvaxNext.Mood;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
@@ -427,12 +426,10 @@ public override void Update(float frameTime)
                 if (!flammable.OnFire)
                 {
                     _alertsSystem.ClearAlert(uid, flammable.FireAlert);
-                    RaiseLocalEvent(uid, new MoodRemoveEffectEvent("OnFire")); // _CorvaxNext: mood
                     continue;
                 }
 
                 _alertsSystem.ShowAlert(uid, flammable.FireAlert);
-                RaiseLocalEvent(uid, new MoodEffectEvent("OnFire")); // _CorvaxNext: mood
 
                 if (flammable.FireStacks > 0)
                 {
diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs
index 33896c54ba8..76efe3290bf 100644
--- a/Content.Server/Bible/BibleSystem.cs
+++ b/Content.Server/Bible/BibleSystem.cs
@@ -14,7 +14,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
-using Content.Shared._CorvaxNext.Mood;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
@@ -154,8 +153,6 @@ private void OnAfterInteract(EntityUid uid, BibleComponent component, AfterInter
                 _audio.PlayPvs(component.HealSoundPath, args.User);
                 _delay.TryResetDelay((uid, useDelay));
             }
-
-            RaiseLocalEvent(args.Target.Value, new MoodEffectEvent("GotBlessed")); // _CorvaxNext: mood
         }
 
         private void AddSummonVerb(EntityUid uid, SummonableComponent component, GetVerbsEvent<AlternativeVerb> args)
diff --git a/Content.Server/Body/Commands/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs
index eba8a7e5172..3e006c539c7 100644
--- a/Content.Server/Body/Commands/AddHandCommand.cs
+++ b/Content.Server/Body/Commands/AddHandCommand.cs
@@ -133,10 +133,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             if (attachAt == default)
                 attachAt = bodySystem.GetBodyChildren(entity, body).First();
 
-            // Shitmed Change Start
-            var slotId = $"{part.Symmetry.ToString().ToLower()} {part.GetHashCode().ToString()}";
-            part.SlotId = part.GetHashCode().ToString();
-            // Shitmed Change End
+            var slotId = part.GetHashCode().ToString();
 
             if (!bodySystem.TryCreatePartSlotAndAttach(attachAt.Id, slotId, hand, BodyPartType.Hand, attachAt.Component, part))
             {
diff --git a/Content.Server/Body/Commands/AttachBodyPartCommand.cs b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
index db8ad3c7db5..82f71619370 100644
--- a/Content.Server/Body/Commands/AttachBodyPartCommand.cs
+++ b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
@@ -98,15 +98,8 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
             }
 
-            // Shitmed Change Start
-            var slotId = "";
-            if (part.Symmetry != BodyPartSymmetry.None)
-                slotId = $"{part.Symmetry.ToString().ToLower()} {part.GetHashCode().ToString()}";
-            else
-                slotId = $"{part.GetHashCode().ToString()}";
+            var slotId = $"AttachBodyPartVerb-{partUid}";
 
-            part.SlotId = part.GetHashCode().ToString();
-            // Shitmed Change End
             // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
             if (body.RootContainer.ContainedEntity != null)
             {
diff --git a/Content.Server/Body/Components/BrainComponent.cs b/Content.Server/Body/Components/BrainComponent.cs
index 003146bd228..004ff24eaff 100644
--- a/Content.Server/Body/Components/BrainComponent.cs
+++ b/Content.Server/Body/Components/BrainComponent.cs
@@ -5,10 +5,5 @@ namespace Content.Server.Body.Components
     [RegisterComponent, Access(typeof(BrainSystem))]
     public sealed partial class BrainComponent : Component
     {
-        /// <summary>
-        ///     CorvaxNext Change: Is this brain currently controlling the entity?
-        /// </summary>
-        [DataField]
-        public bool Active = true;
     }
 }
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index 8be015e3466..4279f3ed2b8 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -1,12 +1,9 @@
-using System.Linq;
 using Content.Server.Body.Components;
 using Content.Server.Ghost;
 using Content.Server.Humanoid;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Systems;
-using Content.Shared.Damage;
-using Content.Shared.Gibbing.Events;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
@@ -23,7 +20,6 @@ public sealed class BodySystem : SharedBodySystem
     [Dependency] private readonly GhostSystem _ghostSystem = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
 
@@ -33,19 +29,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<BodyComponent, MoveInputEvent>(OnRelayMoveInput);
         SubscribeLocalEvent<BodyComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
-        SubscribeLocalEvent<BodyPartComponent, AttemptEntityGibEvent>(OnGibTorsoAttempt); // CorvaxNext: surgery
     }
 
-    // start-_CorvaxNext: surgery
-    private void OnGibTorsoAttempt(Entity<BodyPartComponent> ent, ref AttemptEntityGibEvent args)
-    {
-        if (ent.Comp.PartType == BodyPartType.Torso)
-        {
-            args.GibType = GibType.Skip;
-        }
-    }
-    // end-_CorvaxNext: surgery
-
     private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
     {
         // If they haven't actually moved then ignore it.
@@ -85,8 +70,9 @@ protected override void AddPart(
             var layer = partEnt.Comp.ToHumanoidLayers();
             if (layer != null)
             {
+                var layers = HumanoidVisualLayersExtension.Sublayers(layer.Value);
                 _humanoidSystem.SetLayersVisibility(
-                    bodyEnt, new[] { layer.Value }, visible: true, permanent: true, humanoid);
+                    bodyEnt, layers, visible: true, permanent: true, humanoid);
             }
         }
     }
@@ -107,10 +93,8 @@ protected override void RemovePart(
             return;
 
         var layers = HumanoidVisualLayersExtension.Sublayers(layer.Value);
-
         _humanoidSystem.SetLayersVisibility(
             bodyEnt, layers, visible: false, permanent: true, humanoid);
-        _appearance.SetData(bodyEnt, layer, true);
     }
 
     public override HashSet<EntityUid> GibBody(
@@ -121,9 +105,8 @@ public override HashSet<EntityUid> GibBody(
         Vector2? splatDirection = null,
         float splatModifier = 1,
         Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null,
-        GibType gib = GibType.Gib,
-        GibContentsOption contents = GibContentsOption.Drop)
+        SoundSpecifier? gibSoundOverride = null
+    )
     {
         if (!Resolve(bodyId, ref body, logMissing: false)
             || TerminatingOrDeleted(bodyId)
@@ -137,8 +120,7 @@ public override HashSet<EntityUid> GibBody(
             return new HashSet<EntityUid>();
 
         var gibs = base.GibBody(bodyId, gibOrgans, body, launchGibs: launchGibs,
-            splatDirection: splatDirection, splatModifier: splatModifier, splatCone: splatCone,
-            gib: gib, contents: contents);
+            splatDirection: splatDirection, splatModifier: splatModifier, splatCone:splatCone);
 
         var ev = new BeingGibbedEvent(gibs);
         RaiseLocalEvent(bodyId, ref ev);
@@ -147,59 +129,4 @@ public override HashSet<EntityUid> GibBody(
 
         return gibs;
     }
-
-    // start-_CorvaxNext: surgery
-    public override HashSet<EntityUid> GibPart(
-        EntityUid partId,
-        BodyPartComponent? part = null,
-        bool launchGibs = true,
-        Vector2? splatDirection = null,
-        float splatModifier = 1,
-        Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false)
-            || TerminatingOrDeleted(partId)
-            || EntityManager.IsQueuedForDeletion(partId))
-            return new HashSet<EntityUid>();
-
-        if (Transform(partId).MapUid is null)
-            return new HashSet<EntityUid>();
-
-        var gibs = base.GibPart(partId, part, launchGibs: launchGibs,
-            splatDirection: splatDirection, splatModifier: splatModifier, splatCone: splatCone);
-
-        var ev = new BeingGibbedEvent(gibs);
-        RaiseLocalEvent(partId, ref ev);
-
-        if (gibs.Any())
-            QueueDel(partId);
-
-        return gibs;
-    }
-
-    public override bool BurnPart(EntityUid partId, BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false)
-            || TerminatingOrDeleted(partId)
-            || EntityManager.IsQueuedForDeletion(partId))
-            return false;
-
-        return base.BurnPart(partId, part);
-    }
-
-    protected override void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component)
-    {
-        return;
-    }
-
-    protected override void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance)
-    {
-        foreach (var (visualLayer, markingList) in partAppearance.Markings)
-            foreach (var marking in markingList)
-                _humanoidSystem.RemoveMarking(target, marking.MarkingId, sync: false, humanoid: bodyAppearance);
-
-        Dirty(target, bodyAppearance);
-    }
-    // end-_CorvaxNext: surgery
 }
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs
index 7283664a0b1..86d2cb61ffe 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Server/Body/Systems/BrainSystem.cs
@@ -1,11 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Ghost.Components;
-using Content.Shared._CorvaxNext.Surgery.Body;
 using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
 using Content.Shared.Body.Events;
-using Content.Server._CorvaxNext.DelayedDeath;
-using Content.Shared._CorvaxNext.Surgery.Body.Organs;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Pointing;
@@ -15,50 +11,17 @@ namespace Content.Server.Body.Systems
     public sealed class BrainSystem : EntitySystem
     {
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-        [Dependency] private readonly SharedBodySystem _bodySystem = default!;
 
         public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>(HandleAddition);
-            SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>(HandleRemoval);
+            SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
+            SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
             SubscribeLocalEvent<BrainComponent, PointAttemptEvent>(OnPointAttempt);
         }
 
-        // start-_CorvaxNext: surgery
-        private void HandleRemoval(EntityUid uid, BrainComponent brain, ref OrganRemovedFromBodyEvent args)
-        {
-            if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.OldBody))
-                return;
-
-            brain.Active = false;
-            if (!CheckOtherBrains(args.OldBody))
-            {
-                // Prevents revival, should kill the user within a given timespan too.
-                EnsureComp<DebrainedComponent>(args.OldBody);
-                EnsureComp<DelayedDeathComponent>(args.OldBody);
-                HandleMind(uid, args.OldBody);
-            }
-        }
-
-        private void HandleAddition(EntityUid uid, BrainComponent brain, ref OrganAddedToBodyEvent args)
-        {
-            if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.Body))
-                return;
-
-            if (!CheckOtherBrains(args.Body))
-            {
-                RemComp<DebrainedComponent>(args.Body);
-                if (_bodySystem.TryGetBodyOrganEntityComps<HeartComponent>(args.Body, out var _))
-                    RemComp<DelayedDeathComponent>(args.Body);
-                HandleMind(args.Body, uid);
-            }
-        }
-        // end-_CorvaxNext: surgery
-
-        // CorvaxNext: surgery
-        private void HandleMind(EntityUid newEntity, EntityUid oldEntity, BrainComponent? brain = null)
+        private void HandleMind(EntityUid newEntity, EntityUid oldEntity)
         {
             if (TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity))
                 return;
@@ -74,35 +37,8 @@ private void HandleMind(EntityUid newEntity, EntityUid oldEntity, BrainComponent
                 return;
 
             _mindSystem.TransferTo(mindId, newEntity, mind: mind);
-            if (brain != null) // CorvaxNext: surgery
-                brain.Active = true; // CorvaxNext: surgery
-        }
-
-        // start-_CorvaxNext: surgery
-        private bool CheckOtherBrains(EntityUid entity)
-        {
-            var hasOtherBrains = false;
-            if (TryComp<BodyComponent>(entity, out var body))
-            {
-                if (TryComp<BrainComponent>(entity, out var bodyBrain))
-                    hasOtherBrains = true;
-                else
-                {
-                    foreach (var (organ, _) in _bodySystem.GetBodyOrgans(entity, body))
-                    {
-                        if (TryComp<BrainComponent>(organ, out var brain) && brain.Active)
-                        {
-                            hasOtherBrains = true;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            return hasOtherBrains;
         }
 
-        // end-_CorvaxNext: surgery
         private void OnPointAttempt(Entity<BrainComponent> ent, ref PointAttemptEvent args)
         {
             args.Cancel();
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index c2741d0819c..6209f00419d 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -11,13 +11,10 @@
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Body.Organ;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.EntityEffects;
 using Content.Shared.Mobs.Systems;
-using Content.Shared._CorvaxNext.Surgery.Body;
-using Content.Shared._CorvaxNext.Mood;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -77,9 +74,9 @@ public override void Update(float frameTime)
             if (_mobState.IsDead(uid))
                 continue;
 
-            UpdateSaturation(uid, -(float)respirator.UpdateInterval.TotalSeconds, respirator);
+            UpdateSaturation(uid, -(float) respirator.UpdateInterval.TotalSeconds, respirator);
 
-            if (!_mobState.IsIncapacitated(uid) && !HasComp<DebrainedComponent>(uid)) // CorvaxNext Change - Cannot breathe in crit or when no brain.
+            if (!_mobState.IsIncapacitated(uid)) // cannot breathe in crit.
             {
                 switch (respirator.Status)
                 {
@@ -210,7 +207,7 @@ public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
 
         gas = new GasMixture(gas);
         var lungRatio = 1.0f / organs.Count;
-        gas.Multiply(MathF.Min(lungRatio * gas.Volume / Atmospherics.BreathVolume, lungRatio));
+        gas.Multiply(MathF.Min(lungRatio * gas.Volume/Atmospherics.BreathVolume, lungRatio));
         var solution = _lungSystem.GasToReagent(gas);
 
         float saturation = 0;
@@ -295,10 +292,9 @@ private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
             {
                 _alertsSystem.ShowAlert(ent, entity.Comp1.Alert);
             }
-            RaiseLocalEvent(ent, new MoodEffectEvent("Suffocating")); // _CorvaxNext: mood
         }
 
-        _damageableSys.TryChangeDamage(ent, HasComp<DebrainedComponent>(ent) ? ent.Comp.Damage * 4.5f : ent.Comp.Damage, interruptsDoAfters: false); // CorvaxNext: surgery
+        _damageableSys.TryChangeDamage(ent, ent.Comp.Damage, interruptsDoAfters: false);
     }
 
     private void StopSuffocation(Entity<RespiratorComponent> ent)
diff --git a/Content.Server/Cloning/CloningConsoleSystem.cs b/Content.Server/Cloning/CloningConsoleSystem.cs
index c0fa9833602..050e2b7f064 100644
--- a/Content.Server/Cloning/CloningConsoleSystem.cs
+++ b/Content.Server/Cloning/CloningConsoleSystem.cs
@@ -213,7 +213,7 @@ private CloningConsoleBoundUserInterfaceState GetUserInterfaceState(CloningConso
                 {
                     scanBodyInfo = MetaData(scanBody.Value).EntityName;
 
-                    if (false) // CorvaxNext: surgery Lets you clone living people
+                    if (!_mobStateSystem.IsDead(scanBody.Value))
                     {
                         clonerStatus = ClonerStatus.ScannerOccupantAlive;
                     }
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 49676426dff..65f92740016 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -144,8 +144,7 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
                 return false;
 
             var mind = mindEnt.Comp;
-            // CorvaxNext: surgery Remove this logic entirely, infinite clone army
-            /*if (ClonesWaitingForMind.TryGetValue(mind, out var clone))
+            if (ClonesWaitingForMind.TryGetValue(mind, out var clone))
             {
                 if (EntityManager.EntityExists(clone) &&
                     !_mobStateSystem.IsDead(clone) &&
@@ -154,11 +153,10 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
                     return false; // Mind already has clone
 
                 ClonesWaitingForMind.Remove(mind);
-            }*/
+            }
 
-            // CorvaxNext: surgery Lets you clone living people
-            //if (mind.OwnedEntity != null && !_mobStateSystem.IsDead(mind.OwnedEntity.Value))
-            //    return false; // Body controlled by mind is not dead
+            if (mind.OwnedEntity != null && !_mobStateSystem.IsDead(mind.OwnedEntity.Value))
+                return false; // Body controlled by mind is not dead
 
             // Yes, we still need to track down the client because we need to open the Eui
             if (mind.UserId == null || !_playerManager.TryGetSessionById(mind.UserId.Value, out var client))
@@ -173,10 +171,10 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
             if (!TryComp<PhysicsComponent>(bodyToClone, out var physics))
                 return false;
 
-            var cloningCost = (int)Math.Round(physics.FixturesMass);
+            var cloningCost = (int) Math.Round(physics.FixturesMass);
 
             if (_configManager.GetCVar(CCVars.BiomassEasyMode))
-                cloningCost = (int)Math.Round(cloningCost * EasyModeCloningCost);
+                cloningCost = (int) Math.Round(cloningCost * EasyModeCloningCost);
 
             // biomass checks
             var biomassAmount = _material.GetMaterialAmount(uid, clonePod.RequiredMaterial);
@@ -196,7 +194,7 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
             if (TryComp<DamageableComponent>(bodyToClone, out var damageable) &&
                 damageable.Damage.DamageDict.TryGetValue("Cellular", out var cellularDmg))
             {
-                var chance = Math.Clamp((float)(cellularDmg / 100), 0, 1);
+                var chance = Math.Clamp((float) (cellularDmg / 100), 0, 1);
                 chance *= failChanceModifier;
 
                 if (cellularDmg > 0 && clonePod.ConnectedConsole != null)
@@ -225,7 +223,7 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
             cloneMindReturn.Mind = mind;
             cloneMindReturn.Parent = uid;
             _containerSystem.Insert(mob, clonePod.BodyContainer);
-            //ClonesWaitingForMind.Add(mind, mob); // CorvaxNext: surgery
+            ClonesWaitingForMind.Add(mind, mob);
             UpdateStatus(uid, CloningPodStatus.NoMind, clonePod);
             _euiManager.OpenEui(new AcceptCloningEui(mindEnt, mind, this), client);
 
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
index 51f0f7e7a0d..f0499dc6a2d 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Body.Components;
-using Content.Shared.Body.Part; // CorvaxNext: surgery
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using JetBrains.Annotations;
@@ -26,18 +25,8 @@ public void Execute(EntityUid bodyId, DestructibleSystem system, EntityUid? caus
             }
         }
 
-        // start-_CorvaxNext: surgery
-        if (system.EntityManager.TryGetComponent<BodyPartComponent>(bodyId, out var bodyPart))
-        {
-            if (bodyPart.CanSever
-                && system.BodySystem.BurnPart(bodyId, bodyPart))
-                sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
-        }
-        else
-        {
-            sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
-            system.EntityManager.QueueDeleteEntity(bodyId);
-        }
-        // end-_CorvaxNext: surgery
+        sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
+
+        system.EntityManager.QueueDeleteEntity(bodyId);
     }
 }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
index c1a70c56173..c83fed19069 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Body.Components;
-using Content.Shared.Gibbing.Events;
 using JetBrains.Annotations;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
@@ -8,15 +7,13 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
     [DataDefinition]
     public sealed partial class GibBehavior : IThresholdBehavior
     {
-        [DataField] public GibType GibType = GibType.Gib; // CorvaxNext: surgery
-        [DataField] public GibContentsOption GibContents = GibContentsOption.Drop; // CorvaxNext: surgery
         [DataField("recursive")] private bool _recursive = true;
 
         public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
         {
             if (system.EntityManager.TryGetComponent(owner, out BodyComponent? body))
             {
-                system.BodySystem.GibBody(owner, _recursive, body, gib: GibType, contents: GibContents);
+                system.BodySystem.GibBody(owner, _recursive, body);
             }
         }
     }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
deleted file mode 100644
index c7a4db708d4..00000000000
--- a/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using JetBrains.Annotations;
-
-namespace Content.Server.Destructible.Thresholds.Behaviors;
-
-// start-_CorvaxNext: surgery
-[UsedImplicitly]
-[DataDefinition]
-public sealed partial class GibPartBehavior : IThresholdBehavior
-{
-    public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
-    {
-        if (!system.EntityManager.TryGetComponent(owner, out BodyPartComponent? part))
-            return;
-
-        system.BodySystem.GibPart(owner, part);
-    }
-}
-// end-_CorvaxNext: surgery
diff --git a/Content.Server/EntityEffects/Effects/HealthChange.cs b/Content.Server/EntityEffects/Effects/HealthChange.cs
index f5723b661db..fd2a658745b 100644
--- a/Content.Server/EntityEffects/Effects/HealthChange.cs
+++ b/Content.Server/EntityEffects/Effects/HealthChange.cs
@@ -7,7 +7,6 @@
 using Robust.Shared.Prototypes;
 using System.Linq;
 using System.Text.Json.Serialization;
-using Content.Shared._CorvaxNext.Targeting;
 
 namespace Content.Server.EntityEffects.Effects
 {
@@ -125,12 +124,7 @@ public override void Effect(EntityEffectBaseArgs args)
                 args.TargetEntity,
                 Damage * scale,
                 IgnoreResistances,
-                interruptsDoAfters: false,
-                // start-_CorvaxNext: surgery
-                targetPart: TargetBodyPart.All,
-                partMultiplier: 0.5f,
-                canSever: false);
-                // end-_CorvaxNext: surgery
+                interruptsDoAfters: false);
         }
     }
 }
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 2840ba1292d..9111824960c 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -24,7 +24,6 @@
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
-using Content.Shared._CorvaxNext.Mood;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Store.Components;
 
@@ -479,8 +478,6 @@ private void OnAfterAntagEntSelected(Entity<NukeopsRuleComponent> ent, ref After
         var target = (ent.Comp.TargetStation is not null) ? Name(ent.Comp.TargetStation.Value) : "the target";
 
         RemComp<PacifiedComponent>(args.EntityUid); // Corvax-DionaPacifist: Allow dionas nukes to harm
-        RaiseLocalEvent(args.EntityUid, new MoodEffectEvent("NukeopsFocused")); // _CorvaxNext: mood
-
         _antag.SendBriefing(args.Session,
             Loc.GetString("nukeops-welcome",
                 ("station", target),
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index 78c1a8ec2c7..a313b78eaf1 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -11,7 +11,6 @@
 using Content.Server.RoundEnd;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
-using Content.Shared._CorvaxNext.Mood;
 using Content.Shared.Database;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Humanoid;
@@ -147,7 +146,6 @@ private void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref Aft
 
         _npcFaction.AddFaction(ev.Target, RevolutionaryNpcFaction);
         var revComp = EnsureComp<RevolutionaryComponent>(ev.Target);
-        RaiseLocalEvent(ev.Target, new MoodEffectEvent("RevolutionFocused")); // _CorvaxNext: mood
 
         if (ev.User != null)
         {
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 9bf2b92a1e9..950795fc05e 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -19,7 +19,6 @@
 using Robust.Shared.Random;
 using System.Linq;
 using System.Text;
-using Content.Shared._CorvaxNext.Mood;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -168,8 +167,6 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         _npcFaction.RemoveFaction(traitor, component.NanoTrasenFaction, false);
         _npcFaction.AddFaction(traitor, component.SyndicateFaction);
 
-        RaiseLocalEvent(traitor, new MoodEffectEvent("TraitorFocused")); // _CorvaxNext: mood
-
         Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Finished");
         return true;
     }
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 35345f0a250..903fd1ff3f7 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -2,10 +2,7 @@
 using Content.Server.Inventory;
 using Content.Server.Stack;
 using Content.Server.Stunnable;
-using Content.Shared.Body.Systems;
-using Content.Shared.Body.Events;
 using Content.Shared.ActionBlocker;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
 using Content.Shared.Body.Part;
 using Content.Shared.CombatMode;
 using Content.Shared.Damage.Systems;
@@ -39,7 +36,7 @@ public sealed class HandsSystem : SharedHandsSystem
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PullingSystem _pullingSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
-        [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -55,8 +52,6 @@ public override void Initialize()
             SubscribeLocalEvent<HandsComponent, ComponentGetState>(GetComponentState);
 
             SubscribeLocalEvent<HandsComponent, BeforeExplodeEvent>(OnExploded);
-            SubscribeLocalEvent<HandsComponent, BodyPartEnabledEvent>(HandleBodyPartEnabled); // CorvaxNext: surgery
-            SubscribeLocalEvent<HandsComponent, BodyPartDisabledEvent>(HandleBodyPartDisabled); // CorvaxNext: surgery
 
             CommandBinds.Builder
                 .Bind(ContentKeyFunctions.ThrowItemInHand, new PointerInputCmdHandler(HandleThrowItem))
@@ -106,59 +101,31 @@ private void OnDisarmed(EntityUid uid, HandsComponent component, DisarmedEvent a
             args.Handled = true; // no shove/stun.
         }
 
-        // CorvaxNext: surgery
-        private void TryAddHand(EntityUid uid, HandsComponent component, Entity<BodyPartComponent> part, string slot)
+        private void HandleBodyPartAdded(EntityUid uid, HandsComponent component, ref BodyPartAddedEvent args)
         {
-            if (part.Comp is null
-                || part.Comp.PartType != BodyPartType.Hand)
+            if (args.Part.Comp.PartType != BodyPartType.Hand)
                 return;
 
             // If this annoys you, which it should.
             // Ping Smugleaf.
-            var location = part.Comp.Symmetry switch
+            var location = args.Part.Comp.Symmetry switch
             {
                 BodyPartSymmetry.None => HandLocation.Middle,
                 BodyPartSymmetry.Left => HandLocation.Left,
                 BodyPartSymmetry.Right => HandLocation.Right,
-                _ => throw new ArgumentOutOfRangeException(nameof(part.Comp.Symmetry))
+                _ => throw new ArgumentOutOfRangeException(nameof(args.Part.Comp.Symmetry))
             };
 
-            if (part.Comp.Enabled
-                && _bodySystem.TryGetParentBodyPart(part, out var _, out var parentPartComp)
-                && parentPartComp.Enabled)
-                AddHand(uid, slot, location);
+            AddHand(uid, args.Slot, location);
         }
 
-        // start-_CorvaxNext: surgery
-        private void HandleBodyPartAdded(EntityUid uid, HandsComponent component, ref BodyPartAddedEvent args)
-        {
-            TryAddHand(uid, component, args.Part, args.Slot);
-        }
-        // end-_CorvaxNext: surgery
-
         private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref BodyPartRemovedEvent args)
         {
-            if (args.Part.Comp is null
-                || args.Part.Comp.PartType != BodyPartType.Hand)
-                return;
-            RemoveHand(uid, args.Slot);
-        }
-
-        // start-_CorvaxNext: surgery
-        private void HandleBodyPartEnabled(EntityUid uid, HandsComponent component, ref BodyPartEnabledEvent args) =>
-            TryAddHand(uid, component, args.Part, SharedBodySystem.GetPartSlotContainerId(args.Part.Comp.ParentSlot?.Id ?? string.Empty));
-
-        private void HandleBodyPartDisabled(EntityUid uid, HandsComponent component, ref BodyPartDisabledEvent args)
-        {
-            if (TerminatingOrDeleted(uid)
-                || args.Part.Comp is null
-                || args.Part.Comp.PartType != BodyPartType.Hand)
+            if (args.Part.Comp.PartType != BodyPartType.Hand)
                 return;
 
-            RemoveHand(uid, SharedBodySystem.GetPartSlotContainerId(args.Part.Comp.ParentSlot?.Id ?? string.Empty));
+            RemoveHand(uid, args.Slot);
         }
-        // end-_CorvaxNext: surgery
-
 
         #region pulling
 
@@ -228,7 +195,7 @@ hands.ActiveHandEntity is not { } throwEnt ||
             {
                 var splitStack = _stackSystem.Split(throwEnt, 1, EntityManager.GetComponent<TransformComponent>(player).Coordinates, stack);
 
-                if (splitStack is not { Valid: true })
+                if (splitStack is not {Valid: true})
                     return false;
 
                 throwEnt = splitStack.Value;
diff --git a/Content.Server/Light/Components/MatchstickComponent.cs b/Content.Server/Light/Components/MatchstickComponent.cs
new file mode 100644
index 00000000000..3c47f4c18b3
--- /dev/null
+++ b/Content.Server/Light/Components/MatchstickComponent.cs
@@ -0,0 +1,29 @@
+using Content.Server.Light.EntitySystems;
+using Content.Shared.Smoking;
+using Robust.Shared.Audio;
+
+namespace Content.Server.Light.Components
+{
+    [RegisterComponent]
+    [Access(typeof(MatchstickSystem))]
+    public sealed partial class MatchstickComponent : Component
+    {
+        /// <summary>
+        /// Current state to matchstick. Can be <code>Unlit</code>, <code>Lit</code> or <code>Burnt</code>.
+        /// </summary>
+        [DataField("state")]
+        public SmokableState CurrentState = SmokableState.Unlit;
+
+        /// <summary>
+        /// How long will matchstick last in seconds.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadOnly)]
+        [DataField("duration")]
+        public int Duration = 10;
+
+        /// <summary>
+        /// Sound played when you ignite the matchstick.
+        /// </summary>
+        [DataField("igniteSound", required: true)] public SoundSpecifier IgniteSound = default!;
+    }
+}
diff --git a/Content.Server/Light/EntitySystems/MatchboxSystem.cs b/Content.Server/Light/EntitySystems/MatchboxSystem.cs
index c90f2047796..9a73e44f878 100644
--- a/Content.Server/Light/EntitySystems/MatchboxSystem.cs
+++ b/Content.Server/Light/EntitySystems/MatchboxSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Storage.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Smoking;
-using Content.Shared.Smoking.Components; // CorvaxNext Change
 
 namespace Content.Server.Light.EntitySystems
 {
diff --git a/Content.Server/Light/EntitySystems/MatchstickSystem.cs b/Content.Server/Light/EntitySystems/MatchstickSystem.cs
index af29d6fc019..96e4695784d 100644
--- a/Content.Server/Light/EntitySystems/MatchstickSystem.cs
+++ b/Content.Server/Light/EntitySystems/MatchstickSystem.cs
@@ -4,9 +4,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Smoking;
-using Content.Shared.Smoking.Components; // CorvaxNext Change
-using Content.Shared.Smoking.Systems;
-using Content.Shared.Smoking.Systems; // CorvaxNext Change
 using Content.Shared.Temperature;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -15,7 +12,7 @@
 
 namespace Content.Server.Light.EntitySystems
 {
-    public sealed class MatchstickSystem : SharedMatchstickSystem // CorvaxNext Change
+    public sealed class MatchstickSystem : EntitySystem
     {
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -87,24 +84,22 @@ public void Ignite(Entity<MatchstickComponent> matchstick, EntityUid user)
             _audio.PlayPvs(component.IgniteSound, matchstick, AudioParams.Default.WithVariation(0.125f).WithVolume(-0.125f));
 
             // Change state
-            SetState((matchstick, component), SmokableState.Lit); // CorvaxNext Change
+            SetState(matchstick, component, SmokableState.Lit);
             _litMatches.Add(matchstick);
             matchstick.Owner.SpawnTimer(component.Duration * 1000, delegate
             {
-                SetState((matchstick, component), SmokableState.Burnt); // CorvaxNext Change
+                SetState(matchstick, component, SmokableState.Burnt);
                 _litMatches.Remove(matchstick);
             });
         }
 
-        // CorvaxNext Change Start
-        public override bool SetState(Entity<MatchstickComponent> ent, SmokableState value)
+        private void SetState(EntityUid uid, MatchstickComponent component, SmokableState value)
         {
-            var uid = ent.Owner;
-            var component = ent.Comp;
-
             component.CurrentState = value;
+
             if (_lights.TryGetLight(uid, out var pointLightComponent))
             {
+                _lights.SetEnabled(uid, component.CurrentState == SmokableState.Lit, pointLightComponent);
             }
 
             if (EntityManager.TryGetComponent(uid, out ItemComponent? item))
@@ -124,8 +119,6 @@ public override bool SetState(Entity<MatchstickComponent> ent, SmokableState val
             {
                 _appearance.SetData(uid, SmokingVisuals.Smoking, component.CurrentState, appearance);
             }
-
-            return true; // CorvaxNext Change
         }
     }
 }
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index 883e6c0b869..34b7af0212d 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -38,14 +38,6 @@ public sealed partial class HealthAnalyzerComponent : Component
     [DataField]
     public EntityUid? ScannedEntity;
 
-    // start-_CorvaxNext: surgery
-    /// <summary>
-    /// The body part that is currently being scanned.
-    /// </summary>
-    [DataField]
-    public EntityUid? CurrentBodyPart;
-    // end-_CorvaxNext: surgery
-
     /// <summary>
     /// The maximum range in tiles at which the analyzer can receive continuous updates
     /// </summary>
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 50fd66d6745..15fe2a69cf9 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -202,7 +202,6 @@ private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableU
                 : 0,
             null,
             null,
-            null,
             null
         ));
     }
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index 2a2c874bbf2..cf5869d1cbb 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -1,18 +1,14 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Shared.Body.Part;
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Medical.Components;
 using Content.Server.Popups;
 using Content.Server.Stack;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Audio;
-using Content.Shared.Body.Systems;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
-using Content.Shared.Body.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
@@ -25,8 +21,6 @@
 using Content.Shared.Stacks;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
-using System.Linq;
-using Content.Shared._CorvaxNext.Targeting;
 
 namespace Content.Server.Medical;
 
@@ -42,7 +36,6 @@ public sealed class HealingSystem : EntitySystem
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
     public override void Initialize()
@@ -87,7 +80,7 @@ entity.Comp.DamageContainerID is not null &&
         if (healing.ModifyBloodLevel != 0)
             _bloodstreamSystem.TryModifyBloodLevel(entity.Owner, healing.ModifyBloodLevel);
 
-        var healed = _damageable.TryChangeDamage(entity.Owner, healing.Damage, true, origin: args.User, canSever: false);
+        var healed = _damageable.TryChangeDamage(entity.Owner, healing.Damage, true, origin: args.Args.User);
 
         if (healed == null && healing.BloodlossModifier != 0)
             return;
@@ -121,8 +114,8 @@ entity.Comp.DamageContainerID is not null &&
 
         _audio.PlayPvs(healing.HealingEndSound, entity.Owner, AudioHelpers.WithVariation(0.125f, _random).WithVolume(1f));
 
-        // Logic to determine whether or not to repeat the healing action
-        args.Repeat = HasDamage(entity.Comp, healing) && !dontRepeat || IsPartDamaged(args.User, entity);
+        // Logic to determine the whether or not to repeat the healing action
+        args.Repeat = (HasDamage(entity.Comp, healing) && !dontRepeat);
         if (!args.Repeat && !dontRepeat)
             _popupSystem.PopupEntity(Loc.GetString("medical-item-finished-using", ("item", args.Used)), entity.Owner, args.User);
         args.Handled = true;
@@ -143,22 +136,6 @@ private bool HasDamage(DamageableComponent component, HealingComponent healing)
         return false;
     }
 
-    // start-_CorvaxNext: surgery
-    private bool IsPartDamaged(EntityUid user, EntityUid target)
-    {
-        if (!TryComp(user, out TargetingComponent? targeting))
-            return false;
-
-        var (targetType, targetSymmetry) = _bodySystem.ConvertTargetBodyPart(targeting.Target);
-        foreach (var part in _bodySystem.GetBodyChildrenOfType(target, targetType, symmetry: targetSymmetry))
-            if (TryComp<DamageableComponent>(part.Id, out var damageable)
-                && damageable.TotalDamage > part.Component.MinIntegrity)
-                return true;
-
-        return false;
-    }
-    // end-_CorvaxNext: surgery
-
     private void OnHealingUse(Entity<HealingComponent> entity, ref UseInHandEvent args)
     {
         if (args.Handled)
@@ -197,7 +174,6 @@ targetDamage.DamageContainerID is not null &&
 
         var anythingToDo =
             HasDamage(targetDamage, component) ||
-            IsPartDamaged(user, target) ||
             component.ModifyBloodLevel > 0 // Special case if healing item can restore lost blood...
                 && TryComp<BloodstreamComponent>(target, out var bloodstream)
                 && _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution)
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 6e39dfbae97..90646725bb7 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -1,15 +1,9 @@
 using Content.Server.Body.Components;
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Medical.Components;
 using Content.Server.PowerCell;
 using Content.Server.Temperature.Components;
 using Content.Server.Traits.Assorted;
-using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Chemistry.EntitySystems;
-// CorvaxNext: surgery Start
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems;
-// CorvaxNext: surgery End
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
@@ -23,9 +17,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
-using System.Linq;
 
 namespace Content.Server.Medical;
 
@@ -37,7 +29,6 @@ public sealed class HealthAnalyzerSystem : EntitySystem
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
@@ -49,12 +40,6 @@ public override void Initialize()
         SubscribeLocalEvent<HealthAnalyzerComponent, EntGotInsertedIntoContainerMessage>(OnInsertedIntoContainer);
         SubscribeLocalEvent<HealthAnalyzerComponent, ItemToggledEvent>(OnToggled);
         SubscribeLocalEvent<HealthAnalyzerComponent, DroppedEvent>(OnDropped);
-        // Start-_CorvaxNext: surgery
-        Subs.BuiEvents<HealthAnalyzerComponent>(HealthAnalyzerUiKey.Key, subs =>
-        {
-            subs.Event<HealthAnalyzerPartMessage>(OnHealthAnalyzerPartSelected);
-        });
-        // End-_CorvaxNext: surgery
     }
 
     public override void Update(float frameTime)
@@ -66,7 +51,7 @@ public override void Update(float frameTime)
             if (component.NextUpdate > _timing.CurTime)
                 continue;
 
-            if (component.ScannedEntity is not { } patient)
+            if (component.ScannedEntity is not {} patient)
                 continue;
 
             if (Deleted(patient))
@@ -75,17 +60,6 @@ public override void Update(float frameTime)
                 continue;
             }
 
-            // CorvaxNext: surgery Change Start
-            if (component.CurrentBodyPart != null
-                && (Deleted(component.CurrentBodyPart)
-                || TryComp(component.CurrentBodyPart, out BodyPartComponent? bodyPartComponent)
-                && bodyPartComponent.Body is null))
-            {
-                BeginAnalyzingEntity((uid, component), patient, null);
-                continue;
-            }
-            // CorvaxNext: surgery Change End
-
             component.NextUpdate = _timing.CurTime + component.UpdateInterval;
 
             //Get distance between health analyzer and the scanned entity
@@ -97,7 +71,7 @@ public override void Update(float frameTime)
                 continue;
             }
 
-            UpdateScannedUser(uid, patient, true, component.CurrentBodyPart);
+            UpdateScannedUser(uid, patient, true);
         }
     }
 
@@ -113,8 +87,8 @@ private void OnAfterInteract(Entity<HealthAnalyzerComponent> uid, ref AfterInter
 
         var doAfterCancelled = !_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, uid.Comp.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
         {
+            NeedHand = true,
             BreakOnMove = true,
-            NeedHand = true
         });
 
         if (args.Target == args.User || doAfterCancelled || uid.Comp.Silent)
@@ -177,14 +151,14 @@ private void OpenUserInterface(EntityUid user, EntityUid analyzer)
     /// </summary>
     /// <param name="healthAnalyzer">The health analyzer that should receive the updates</param>
     /// <param name="target">The entity to start analyzing</param>
-    private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target, EntityUid? part = null)
+    private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target)
     {
         //Link the health analyzer to the scanned entity
         healthAnalyzer.Comp.ScannedEntity = target;
-        healthAnalyzer.Comp.CurrentBodyPart = part;
 
         _toggle.TryActivate(healthAnalyzer.Owner);
-        UpdateScannedUser(healthAnalyzer, target, true, part);
+
+        UpdateScannedUser(healthAnalyzer, target, true);
     }
 
     /// <summary>
@@ -196,50 +170,26 @@ private void StopAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer,
     {
         //Unlink the analyzer
         healthAnalyzer.Comp.ScannedEntity = null;
-        healthAnalyzer.Comp.CurrentBodyPart = null;
 
         _toggle.TryDeactivate(healthAnalyzer.Owner);
 
         UpdateScannedUser(healthAnalyzer, target, false);
     }
 
-    // Start-_CorvaxNext: surgery
-    /// <summary>
-    /// Handle the selection of a body part on the health analyzer
-    /// </summary>
-    /// <param name="healthAnalyzer">The health analyzer that's receiving the updates</param>
-    /// <param name="args">The message containing the selected part</param>
-    private void OnHealthAnalyzerPartSelected(Entity<HealthAnalyzerComponent> healthAnalyzer, ref HealthAnalyzerPartMessage args)
-    {
-        if (!TryGetEntity(args.Owner, out var owner))
-            return;
-
-        if (args.BodyPart == null)
-        {
-            BeginAnalyzingEntity(healthAnalyzer, owner.Value, null);
-        }
-        else
-        {
-            var (targetType, targetSymmetry) = _bodySystem.ConvertTargetBodyPart(args.BodyPart.Value);
-            if (_bodySystem.GetBodyChildrenOfType(owner.Value, targetType, symmetry: targetSymmetry) is { } part)
-                BeginAnalyzingEntity(healthAnalyzer, owner.Value, part.FirstOrDefault().Id);
-        }
-    }
-// End-_CorvaxNext: surgery
-
     /// <summary>
     /// Send an update for the target to the healthAnalyzer
     /// </summary>
     /// <param name="healthAnalyzer">The health analyzer</param>
     /// <param name="target">The entity being scanned</param>
     /// <param name="scanMode">True makes the UI show ACTIVE, False makes the UI show INACTIVE</param>
-    public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode, EntityUid? part = null)
+    public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode)
     {
         if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key))
             return;
 
         if (!HasComp<DamageableComponent>(target))
             return;
+
         var bodyTemperature = float.NaN;
 
         if (TryComp<TemperatureComponent>(target, out var temp))
@@ -257,15 +207,8 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
             bleeding = bloodstream.BleedAmount > 0;
         }
 
-        /*if (HasComp<UnrevivableComponent>(target)) Somehow we dont have unrevivable???
+        if (HasComp<UnrevivableComponent>(target))
             unrevivable = true;
-        */
-
-        // Start-_CorvaxNext: surgery
-        Dictionary<TargetBodyPart, TargetIntegrity>? body = null;
-        if (HasComp<TargetingComponent>(target))
-            body = _bodySystem.GetBodyPartStatus(target);
-        // End-_CorvaxNext: surgery
 
         _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage(
             GetNetEntity(target),
@@ -273,9 +216,7 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
             bloodAmount,
             scanMode,
             bleeding,
-            unrevivable,
-            body, // CorvaxNext: surgery
-            part != null ? GetNetEntity(part) : null // CorvaxNext: surgery
+            unrevivable
         ));
     }
 }
diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs
index ee27eaad77c..5cff161e0eb 100644
--- a/Content.Server/Medical/VomitSystem.cs
+++ b/Content.Server/Medical/VomitSystem.cs
@@ -12,7 +12,6 @@
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.StatusEffect;
 using Robust.Server.Audio;
-using Content.Shared._CorvaxNext.Mood;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 
@@ -97,8 +96,6 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -
             // Force sound to play as spill doesn't work if solution is empty.
             _audio.PlayPvs("/Audio/Effects/Fluids/splat.ogg", uid, AudioParams.Default.WithVariation(0.2f).WithVolume(-4f));
             _popup.PopupEntity(Loc.GetString("disease-vomit", ("person", Identity.Entity(uid, EntityManager))), uid);
-
-            RaiseLocalEvent(uid, new MoodEffectEvent("MobVomit")); // _CorvaxNext: mood
         }
     }
 }
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
index e10250fd7e2..ef46415ceac 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
@@ -201,7 +201,7 @@ private void UpdateRanged(float frameTime)
             {
                 return;
             }
-            _gun.SetTarget(gun, comp.Target); // CorvaxNext: Laying System
+            _gun.SetTarget(gun, comp.Target); // _CorvaxNext: Laying System
             _gun.AttemptShoot(uid, gunUid, gun, targetCordinates);
         }
     }
diff --git a/Content.Server/_CorvaxNext/Body/Components/RespiratorImmunityComponent.cs b/Content.Server/_CorvaxNext/Body/Components/RespiratorImmunityComponent.cs
deleted file mode 100644
index cd52a2b3fa5..00000000000
--- a/Content.Server/_CorvaxNext/Body/Components/RespiratorImmunityComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server._CorvaxNext.Body.Components;
-
-[RegisterComponent]
-public sealed partial class RespiratorImmunityComponent : Component
-{
-
-}
diff --git a/Content.Server/_CorvaxNext/Body/Components/StatusEffectOrganComponent.cs b/Content.Server/_CorvaxNext/Body/Components/StatusEffectOrganComponent.cs
deleted file mode 100644
index a064f9e1e1c..00000000000
--- a/Content.Server/_CorvaxNext/Body/Components/StatusEffectOrganComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.StatusEffect;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Content.Server._CorvaxNext.Body.Systems;
-
-namespace Content.Server._CorvaxNext.Body.Components;
-
-[RegisterComponent, Access(typeof(StatusEffectOrganSystem))]
-[AutoGenerateComponentPause]
-public sealed partial class StatusEffectOrganComponent : Component
-{
-    /// <summary>
-    /// List of status effects and components to refresh while the organ is installed.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<ProtoId<StatusEffectPrototype>, string> Refresh = new();
-
-    /// <summary>
-    /// How long to wait between each refresh.
-    /// Effects can only last at most this long once the organ is removed.
-    /// </summary>
-    [DataField]
-    public TimeSpan Delay = TimeSpan.FromSeconds(5);
-
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextUpdate = TimeSpan.Zero;
-}
diff --git a/Content.Server/_CorvaxNext/Body/Systems/StatusEffectOrganSystem.cs b/Content.Server/_CorvaxNext/Body/Systems/StatusEffectOrganSystem.cs
deleted file mode 100644
index 53e8f51f14a..00000000000
--- a/Content.Server/_CorvaxNext/Body/Systems/StatusEffectOrganSystem.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Body.Organ;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Timing;
-using Content.Server._CorvaxNext.Body.Components;
-
-namespace Content.Server._CorvaxNext.Body.Systems;
-
-public sealed class StatusEffectOrganSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly StatusEffectsSystem _effects = default!;
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<StatusEffectOrganComponent, OrganComponent>();
-        var now = _timing.CurTime;
-        while (query.MoveNext(out var uid, out var comp, out var organ))
-        {
-            if (now < comp.NextUpdate || organ.Body is not {} body)
-                continue;
-
-            comp.NextUpdate = now + comp.Delay;
-            if (!TryComp<StatusEffectsComponent>(body, out var effects))
-                continue;
-
-            foreach (var (key, component) in comp.Refresh)
-            {
-                _effects.TryAddStatusEffect(body, key, comp.Delay, refresh: true, component, effects);
-            }
-        }
-    }
-}
diff --git a/Content.Server/_CorvaxNext/Cybernetics/CyberneticsSystem.cs b/Content.Server/_CorvaxNext/Cybernetics/CyberneticsSystem.cs
deleted file mode 100644
index b46770b0fe7..00000000000
--- a/Content.Server/_CorvaxNext/Cybernetics/CyberneticsSystem.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Content.Server.Emp;
-using Content.Shared._CorvaxNext.Surgery.Body;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
-using Content.Shared._CorvaxNext.Surgery.Body.Organs;
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Organ;
-
-namespace Content.Server._CorvaxNext.Cybernetics;
-
-internal sealed class CyberneticsSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<CyberneticsComponent, EmpPulseEvent>(OnEmpPulse);
-        SubscribeLocalEvent<CyberneticsComponent, EmpDisabledRemoved>(OnEmpDisabledRemoved);
-    }
-    private void OnEmpPulse(Entity<CyberneticsComponent> cyberEnt, ref EmpPulseEvent ev)
-    {
-        if (!cyberEnt.Comp.Disabled)
-        {
-            ev.Affected = true;
-            ev.Disabled = true;
-            cyberEnt.Comp.Disabled = true;
-
-            if (HasComp<OrganComponent>(cyberEnt))
-            {
-                var disableEvent = new OrganEnableChangedEvent(false);
-                RaiseLocalEvent(cyberEnt, ref disableEvent);
-            }
-            else if (HasComp<BodyPartComponent>(cyberEnt))
-            {
-                var disableEvent = new BodyPartEnableChangedEvent(false);
-                RaiseLocalEvent(cyberEnt, ref disableEvent);
-            }
-        }
-    }
-
-    private void OnEmpDisabledRemoved(Entity<CyberneticsComponent> cyberEnt, ref EmpDisabledRemoved ev)
-    {
-        if (cyberEnt.Comp.Disabled)
-        {
-            cyberEnt.Comp.Disabled = false;
-            if (HasComp<OrganComponent>(cyberEnt))
-            {
-                var enableEvent = new OrganEnableChangedEvent(true);
-                RaiseLocalEvent(cyberEnt, ref enableEvent);
-            }
-            else if (HasComp<BodyPartComponent>(cyberEnt))
-            {
-                var enableEvent = new BodyPartEnableChangedEvent(true);
-                RaiseLocalEvent(cyberEnt, ref enableEvent);
-            }
-        }
-    }
-}
diff --git a/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathComponent.cs b/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathComponent.cs
deleted file mode 100644
index 20b432c130e..00000000000
--- a/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace Content.Server._CorvaxNext.DelayedDeath;
-
-[RegisterComponent]
-public sealed partial class DelayedDeathComponent : Component
-{
-    /// <summary>
-    /// How long it takes to kill the entity.
-    /// </summary>
-    [DataField]
-    public float DeathTime = 60;
-
-    /// <summary>
-    /// How long it has been since the delayed death timer started.
-    /// </summary>
-    public float DeathTimer;
-}
diff --git a/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathSystem.cs b/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathSystem.cs
deleted file mode 100644
index 1bf9272e24e..00000000000
--- a/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathSystem.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.Mobs.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server._CorvaxNext.DelayedDeath;
-
-public partial class DelayedDeathSystem : EntitySystem
-{
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly IPrototypeManager _prototypes = default!;
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        using var query = EntityQueryEnumerator<DelayedDeathComponent>();
-        while (query.MoveNext(out var ent, out var component))
-        {
-            component.DeathTimer += frameTime;
-
-            if (component.DeathTimer >= component.DeathTime && !_mobState.IsDead(ent))
-            {
-                var damage = new DamageSpecifier(_prototypes.Index<DamageTypePrototype>("Bloodloss"), 150);
-                _damageable.TryChangeDamage(ent, damage, partMultiplier: 0f);
-            }
-        }
-    }
-}
diff --git a/Content.Server/_CorvaxNext/Mood/MoodComponent.cs b/Content.Server/_CorvaxNext/Mood/MoodComponent.cs
deleted file mode 100644
index c35ffad1206..00000000000
--- a/Content.Server/_CorvaxNext/Mood/MoodComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Alert;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Generic;
-
-namespace Content.Server._CorvaxNext.Mood
-{
-
-}
diff --git a/Content.Server/_CorvaxNext/Mood/MoodSystem.cs b/Content.Server/_CorvaxNext/Mood/MoodSystem.cs
deleted file mode 100644
index ac02c04a940..00000000000
--- a/Content.Server/_CorvaxNext/Mood/MoodSystem.cs
+++ /dev/null
@@ -1,497 +0,0 @@
-using Content.Server.Chat.Managers;
-using Content.Server.Popups;
-using Content.Shared.Alert;
-using Content.Shared._CorvaxNext.Alert.Click;
-using Content.Shared.Chat;
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Movement.Systems;
-using Content.Shared._CorvaxNext.Mood;
-using Content.Shared._CorvaxNext.Overlays;
-using Content.Shared.Popups;
-using Content.Server._CorvaxNext.Traits.Assorted;
-using Robust.Shared.Prototypes;
-using Timer = Robust.Shared.Timing.Timer;
-using Robust.Shared.Player;
-using Robust.Shared.Configuration;
-using Content.Shared._CorvaxNext.NextVars;
-using Content.Shared.Examine;
-using Content.Shared.Humanoid;
-
-namespace Content.Server._CorvaxNext.Mood;
-
-public sealed class MoodSystem : EntitySystem
-{
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
-    [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
-    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly IChatManager _chat = default!;
-
-    [ValidatePrototypeId<AlertCategoryPrototype>]
-    private const string MoodCategory = "Mood";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<MoodComponent, ComponentStartup>(OnInit);
-        SubscribeLocalEvent<MoodComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<MoodComponent, MoodEffectEvent>(OnMoodEffect);
-        SubscribeLocalEvent<MoodComponent, DamageChangedEvent>(OnDamageChange);
-        SubscribeLocalEvent<MoodComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMoveSpeed);
-        SubscribeLocalEvent<MoodComponent, MoodRemoveEffectEvent>(OnRemoveEffect);
-
-        SubscribeLocalEvent<MoodModifyTraitComponent, ComponentStartup>(OnTraitStartup);
-
-        SubscribeLocalEvent<MoodComponent, MoodCheckAlertEvent>(OnAlertClicked);
-        SubscribeLocalEvent<MoodComponent, ExaminedEvent>(OnExamined);
-    }
-
-    private void OnExamined(EntityUid uid, MoodComponent component, ExaminedEvent args)
-    {
-        var mood = GetMoodName(component.CurrentMoodThreshold);
-        var color = GetMoodColor(component.CurrentMoodThreshold);
-        if (mood == string.Empty)
-            return;
-
-        args.PushText(Loc.GetString("mood-component-examine",
-            ("color", color),
-            ("mood", mood),
-            ("user", uid)));
-    }
-
-    private void OnAlertClicked(EntityUid uid, MoodComponent component, MoodCheckAlertEvent args)
-    {
-        if (component.CurrentMoodThreshold == MoodThreshold.Dead ||
-            !TryComp<ActorComponent>(uid, out var actor))
-            return;
-
-        var session = actor.PlayerSession;
-        var msgStart = Loc.GetString("mood-show-effects-start");
-        _chat.ChatMessageToOne(ChatChannel.Emotes,
-            msgStart,
-            msgStart,
-            EntityUid.Invalid,
-            false,
-            session.Channel);
-
-        foreach (var (_, protoId) in component.CategorisedEffects)
-        {
-            if (!_prototypeManager.TryIndex<MoodEffectPrototype>(protoId, out var proto)
-                || proto.Hidden)
-                continue;
-
-            SendDescToChat(proto, session);
-        }
-
-        foreach (var (protoId, _) in component.UncategorisedEffects)
-        {
-            if (!_prototypeManager.TryIndex<MoodEffectPrototype>(protoId, out var proto)
-                || proto.Hidden)
-                continue;
-
-            SendDescToChat(proto, session);
-        }
-    }
-
-    private void SendDescToChat(MoodEffectPrototype proto, ICommonSession session)
-    {
-        var color = (proto.MoodChange > 0) ? "#008000" : "#BA0000";
-        var msg = $"[font size=10][color={color}]{proto.Description}[/color][/font]";
-
-        _chat.ChatMessageToOne(ChatChannel.Emotes,
-            msg,
-            msg,
-            EntityUid.Invalid,
-            false,
-            session.Channel);
-    }
-
-    private void OnRemoveEffect(EntityUid uid, MoodComponent component, MoodRemoveEffectEvent args)
-    {
-        if (component.UncategorisedEffects.TryGetValue(args.EffectId, out _))
-            RemoveTimedOutEffect(uid, args.EffectId);
-        else
-        {
-            foreach (var (category, id) in component.CategorisedEffects)
-            {
-                if (id == args.EffectId)
-                {
-                    RemoveTimedOutEffect(uid, args.EffectId, category);
-                    return;
-                }
-            }
-        }
-    }
-
-    private void OnRefreshMoveSpeed(EntityUid uid, MoodComponent component, RefreshMovementSpeedModifiersEvent args)
-    {
-        if (component.CurrentMoodThreshold is > MoodThreshold.Meh and < MoodThreshold.Good or MoodThreshold.Dead
-            || _jetpack.IsUserFlying(uid))
-            return;
-
-        // This ridiculous math serves a purpose making high mood less impactful on movement speed than low mood
-        var modifier =
-            Math.Clamp(
-                (component.CurrentMoodLevel >= component.MoodThresholds[MoodThreshold.Neutral])
-                    ? _config.GetCVar(NextVars.MoodIncreasesSpeed)
-                        ? MathF.Pow(1.003f, component.CurrentMoodLevel - component.MoodThresholds[MoodThreshold.Neutral])
-                        : 1
-                    : _config.GetCVar(NextVars.MoodDecreasesSpeed)
-                        ? 2 - component.MoodThresholds[MoodThreshold.Neutral] / component.CurrentMoodLevel
-                        : 1,
-                component.MinimumSpeedModifier,
-                component.MaximumSpeedModifier);
-
-        args.ModifySpeed(1, modifier);
-    }
-
-    private void OnTraitStartup(EntityUid uid, MoodModifyTraitComponent component, ComponentStartup args)
-    {
-        if (!TryComp<MoodComponent>(uid, out var mood))
-            return;
-
-        mood.GoodMoodMultiplier = component.GoodMoodMultiplier;
-        mood.BadMoodMultiplier = component.BadMoodMultiplier;
-        RaiseLocalEvent(uid, new MoodEffectEvent($"{component.MoodId}"));
-    }
-
-    private void OnMoodEffect(EntityUid uid, MoodComponent component, MoodEffectEvent args)
-    {
-        if (!_config.GetCVar(NextVars.MoodEnabled)
-            || !_prototypeManager.TryIndex<MoodEffectPrototype>(args.EffectId, out var prototype))
-            return;
-
-        var ev = new OnMoodEffect(uid, args.EffectId, args.EffectModifier, args.EffectOffset);
-        RaiseLocalEvent(uid, ref ev);
-
-        ApplyEffect(uid, component, prototype, ev.EffectModifier, ev.EffectOffset);
-    }
-
-    private void ApplyEffect(EntityUid uid, MoodComponent component, MoodEffectPrototype prototype, float eventModifier = 1, float eventOffset = 0)
-    {
-        // Apply categorised effect
-        if (prototype.Category != null)
-        {
-            if (component.CategorisedEffects.TryGetValue(prototype.Category, out var oldPrototypeId))
-            {
-                if (!_prototypeManager.TryIndex<MoodEffectPrototype>(oldPrototypeId, out var oldPrototype))
-                    return;
-
-                if (prototype.ID != oldPrototype.ID)
-                {
-                    SendEffectText(uid, prototype);
-                    component.CategorisedEffects[prototype.Category] = prototype.ID;
-                }
-            }
-            else
-            {
-                component.CategorisedEffects.Add(prototype.Category, prototype.ID);
-            }
-
-            if (prototype.Timeout != 0)
-                Timer.Spawn(TimeSpan.FromSeconds(prototype.Timeout), () => RemoveTimedOutEffect(uid, prototype.ID, prototype.Category));
-        }
-        // Apply uncategorised effect
-        else
-        {
-            if (component.UncategorisedEffects.TryGetValue(prototype.ID, out _))
-                return;
-
-            var moodChange = prototype.MoodChange * eventModifier + eventOffset;
-            if (moodChange == 0)
-                return;
-
-            SendEffectText(uid, prototype);
-            component.UncategorisedEffects.Add(prototype.ID, moodChange);
-
-            if (prototype.Timeout != 0)
-                Timer.Spawn(TimeSpan.FromSeconds(prototype.Timeout), () => RemoveTimedOutEffect(uid, prototype.ID));
-        }
-
-        RefreshMood(uid, component);
-    }
-
-    private void SendEffectText(EntityUid uid, MoodEffectPrototype prototype)
-    {
-        if (!prototype.Hidden)
-            _popup.PopupEntity(prototype.Description, uid, uid, (prototype.MoodChange > 0) ? PopupType.Medium : PopupType.MediumCaution);
-    }
-
-    private void RemoveTimedOutEffect(EntityUid uid, string prototypeId, string? category = null)
-    {
-        if (!TryComp<MoodComponent>(uid, out var comp))
-            return;
-
-        if (category == null)
-        {
-            if (!comp.UncategorisedEffects.ContainsKey(prototypeId))
-                return;
-            comp.UncategorisedEffects.Remove(prototypeId);
-        }
-        else
-        {
-            if (!comp.CategorisedEffects.TryGetValue(category, out var currentProtoId)
-                || currentProtoId != prototypeId
-                || !_prototypeManager.HasIndex<MoodEffectPrototype>(currentProtoId))
-                return;
-            comp.CategorisedEffects.Remove(category);
-        }
-
-        RefreshMood(uid, comp);
-    }
-
-    private void OnMobStateChanged(EntityUid uid, MoodComponent component, MobStateChangedEvent args)
-    {
-        if (args.NewMobState == MobState.Dead && args.OldMobState != MobState.Dead)
-        {
-            var ev = new MoodEffectEvent("Dead");
-            RaiseLocalEvent(uid, ev);
-        }
-        else if (args.OldMobState == MobState.Dead && args.NewMobState != MobState.Dead)
-        {
-            var ev = new MoodRemoveEffectEvent("Dead");
-            RaiseLocalEvent(uid, ev);
-        }
-        RefreshMood(uid, component);
-
-        if (args.Origin == null ||
-            args.NewMobState != MobState.Alive ||
-            !HasComp<HumanoidAppearanceComponent>(uid) ||
-            !HasComp<MoodComponent>(args.Origin))
-            return;
-
-        // Finally players won't miss any crit bodies, because of the sweet mood bonus!
-        switch (args.NewMobState)
-        {
-            case MobState.Alive:
-                RaiseLocalEvent(uid, new MoodEffectEvent("GotSavedLife"));
-                RaiseLocalEvent(args.Origin.Value, new MoodEffectEvent("SavedLife"));
-                break;
-            default:
-                RaiseLocalEvent(uid, new MoodRemoveEffectEvent("GotSavedLife"));
-                break;
-        }
-    }
-
-    // <summary>
-    //      Recalculate the mood level of an entity by summing up all moodlets.
-    // </summary>
-    private void RefreshMood(EntityUid uid, MoodComponent component)
-    {
-        var amount = 0f;
-
-        foreach (var (_, protoId) in component.CategorisedEffects)
-        {
-            if (!_prototypeManager.TryIndex<MoodEffectPrototype>(protoId, out var prototype))
-                continue;
-
-            if (prototype.MoodChange > 0)
-                amount += prototype.MoodChange * component.GoodMoodMultiplier;
-            else
-                amount += prototype.MoodChange * component.BadMoodMultiplier;
-        }
-
-        foreach (var (_, value) in component.UncategorisedEffects)
-        {
-            if (value > 0)
-                amount += value * component.GoodMoodMultiplier;
-            else
-                amount += value * component.BadMoodMultiplier;
-        }
-
-        SetMood(uid, amount, component, refresh: true);
-    }
-
-    private void OnInit(EntityUid uid, MoodComponent component, ComponentStartup args)
-    {
-        if (_config.GetCVar(NextVars.MoodModifiesThresholds)
-            && TryComp<MobThresholdsComponent>(uid, out var mobThresholdsComponent)
-            && _mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var critThreshold, mobThresholdsComponent))
-            component.CritThresholdBeforeModify = critThreshold.Value;
-
-        RefreshMood(uid, component);
-    }
-
-    private void SetMood(EntityUid uid, float amount, MoodComponent? component = null, bool force = false, bool refresh = false)
-    {
-        if (!_config.GetCVar(NextVars.MoodEnabled)
-            || !Resolve(uid, ref component)
-            || component.CurrentMoodThreshold == MoodThreshold.Dead && !refresh)
-            return;
-
-        var neutral = component.MoodThresholds[MoodThreshold.Neutral];
-        var ev = new OnSetMoodEvent(uid, amount, false);
-        RaiseLocalEvent(uid, ref ev);
-
-        if (ev.Cancelled)
-            return;
-        else
-        {
-            uid = ev.Receiver;
-            amount = ev.MoodChangedAmount;
-        }
-
-        var newMoodLevel = amount + neutral;
-        if (!force)
-        {
-            newMoodLevel = Math.Clamp(amount + neutral,
-                component.MoodThresholds[MoodThreshold.Dead],
-                component.MoodThresholds[MoodThreshold.Perfect]);
-        }
-
-        component.CurrentMoodLevel = newMoodLevel;
-
-        component.NeutralMoodThreshold = component.MoodThresholds.GetValueOrDefault(MoodThreshold.Neutral);
-        Dirty(uid, component);
-        UpdateCurrentThreshold(uid, component);
-    }
-
-    private void UpdateCurrentThreshold(EntityUid uid, MoodComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        var calculatedThreshold = GetMoodThreshold(component);
-        if (calculatedThreshold == component.CurrentMoodThreshold)
-            return;
-
-        component.CurrentMoodThreshold = calculatedThreshold;
-
-        DoMoodThresholdsEffects(uid, component);
-    }
-
-    private void DoMoodThresholdsEffects(EntityUid uid, MoodComponent? component = null, bool force = false)
-    {
-        if (!Resolve(uid, ref component)
-            || component.CurrentMoodThreshold == component.LastThreshold && !force)
-            return;
-
-        var modifier = GetMovementThreshold(component.CurrentMoodThreshold, component);
-
-        // Modify mob stats
-        if (modifier != GetMovementThreshold(component.LastThreshold, component))
-        {
-            _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-            SetCritThreshold(uid, component, modifier);
-            RefreshShaders(uid, modifier);
-        }
-
-        // Modify interface
-        if (component.MoodThresholdsAlerts.TryGetValue(component.CurrentMoodThreshold, out var alertId))
-            _alerts.ShowAlert(uid, alertId);
-        else
-            _alerts.ClearAlertCategory(uid, MoodCategory);
-
-        component.LastThreshold = component.CurrentMoodThreshold;
-    }
-
-    private void RefreshShaders(EntityUid uid, int modifier)
-    {
-        if (modifier == -1)
-            EnsureComp<SaturationScaleOverlayComponent>(uid);
-        else
-            RemComp<SaturationScaleOverlayComponent>(uid);
-    }
-
-    private void SetCritThreshold(EntityUid uid, MoodComponent component, int modifier)
-    {
-        if (!_config.GetCVar(NextVars.MoodModifiesThresholds)
-            || !TryComp<MobThresholdsComponent>(uid, out var mobThresholds)
-            || !_mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var key))
-            return;
-
-        var newKey = modifier switch
-        {
-            1 => FixedPoint2.New(key.Value.Float() * component.IncreaseCritThreshold),
-            -1 => FixedPoint2.New(key.Value.Float() * component.DecreaseCritThreshold),
-            _ => component.CritThresholdBeforeModify
-        };
-
-        component.CritThresholdBeforeModify = key.Value;
-        _mobThreshold.SetMobStateThreshold(uid, newKey, MobState.Critical, mobThresholds);
-    }
-
-    private MoodThreshold GetMoodThreshold(MoodComponent component, float? moodLevel = null)
-    {
-        moodLevel ??= component.CurrentMoodLevel;
-        var result = MoodThreshold.Dead;
-        var value = component.MoodThresholds[MoodThreshold.Perfect];
-
-        foreach (var threshold in component.MoodThresholds)
-        {
-            if (threshold.Value <= value && threshold.Value >= moodLevel)
-            {
-                result = threshold.Key;
-                value = threshold.Value;
-            }
-        }
-
-        return result;
-    }
-
-    private int GetMovementThreshold(MoodThreshold threshold, MoodComponent component)
-    {
-        if (threshold >= component.BuffsMoodThreshold)
-            return 1;
-
-        if (threshold <= component.ConsMoodThreshold)
-            return -1;
-
-        return 0;
-    }
-
-    private string GetMoodName(MoodThreshold threshold)
-    {
-        return threshold switch
-        {
-            MoodThreshold.Insane or MoodThreshold.Horrible or MoodThreshold.Terrible => Loc.GetString("mood-examine-horrible"),
-            MoodThreshold.Bad or MoodThreshold.Meh => Loc.GetString("mood-examine-bad"),
-            MoodThreshold.Neutral => Loc.GetString("mood-examine-neutral"),
-            MoodThreshold.Good or MoodThreshold.Great => Loc.GetString("mood-examine-good"),
-            MoodThreshold.Exceptional or MoodThreshold.Perfect => Loc.GetString("mood-examine-perfect"),
-            _ => Loc.GetString(""),
-        };
-    }
-
-    private static Color GetMoodColor(MoodThreshold threshold)
-    {
-        return threshold switch
-        {
-            MoodThreshold.Insane or MoodThreshold.Horrible or MoodThreshold.Terrible => Color.Red,
-            MoodThreshold.Bad or MoodThreshold.Meh => Color.Orange,
-            MoodThreshold.Neutral => Color.Blue,
-            MoodThreshold.Good or MoodThreshold.Great => Color.Green,
-            MoodThreshold.Exceptional or MoodThreshold.Perfect => Color.Aquamarine,
-            _ => Color.Gray,
-        };
-    }
-
-    private void OnDamageChange(EntityUid uid, MoodComponent component, DamageChangedEvent args)
-    {
-        if (!_mobThreshold.TryGetPercentageForState(uid, MobState.Critical, args.Damageable.TotalDamage, out var damage))
-            return;
-
-        var protoId = "HealthNoDamage";
-        var value = component.HealthMoodEffectsThresholds["HealthNoDamage"];
-
-        foreach (var threshold in component.HealthMoodEffectsThresholds)
-        {
-            if (threshold.Value <= damage && threshold.Value >= value)
-            {
-                protoId = threshold.Key;
-                value = threshold.Value;
-            }
-        }
-
-        var ev = new MoodEffectEvent(protoId);
-        RaiseLocalEvent(uid, ev);
-    }
-}
diff --git a/Content.Server/_CorvaxNext/Speech/Components/OhioAccentComponent.cs b/Content.Server/_CorvaxNext/Speech/Components/OhioAccentComponent.cs
deleted file mode 100644
index 6f28363dcb5..00000000000
--- a/Content.Server/_CorvaxNext/Speech/Components/OhioAccentComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Server._CorvaxNext.Speech.EntitySystems;
-
-namespace Content.Server._CorvaxNext.Speech.Components;
-
-[RegisterComponent]
-[Access(typeof(OhioAccentSystem))]
-public sealed partial class OhioAccentComponent : Component
-{ }
diff --git a/Content.Server/_CorvaxNext/Speech/EntitySystems/OhioAccentSystem.cs b/Content.Server/_CorvaxNext/Speech/EntitySystems/OhioAccentSystem.cs
deleted file mode 100644
index 646923c4379..00000000000
--- a/Content.Server/_CorvaxNext/Speech/EntitySystems/OhioAccentSystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Server._CorvaxNext.Speech.Components;
-using Content.Server.Speech;
-using Content.Server.Speech.EntitySystems;
-using Robust.Shared.Random;
-
-namespace Content.Server._CorvaxNext.Speech.EntitySystems;
-
-public sealed class OhioAccentSystem : EntitySystem
-{
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<OhioAccentComponent, AccentGetEvent>(OnAccent);
-    }
-
-    private void OnAccent(EntityUid uid, OhioAccentComponent component, ref AccentGetEvent args)
-    {
-        args.Message = Accentuate("ohio", "accent-ohio-prefix-", "accent-ohio-suffix-", args);
-    }
-
-    private string Accentuate(string accentName, string prefix, string suffix, AccentGetEvent args) {
-        var message = args.Message;
-
-        message = _replacement.ApplyReplacements(message, accentName);
-
-        // Prefix
-        if (_random.Prob(0.15f))
-        {
-            var pick = _random.Next(1, 7);
-
-            // Reverse sanitize capital
-            message = message[0].ToString().ToLower() + message.Remove(0, 1);
-            message = Loc.GetString(prefix + pick) + " " + message;
-        }
-
-        // Sanitize capital again, in case we substituted a word that should be capitalized
-        message = message[0].ToString().ToUpper() + message.Remove(0, 1);
-
-        // Suffixes
-        if (_random.Prob(0.3f))
-        {
-            var pick = _random.Next(1, 7);
-            message += Loc.GetString(suffix + pick);
-        }
-
-        return message;
-    }
-};
diff --git a/Content.Server/_CorvaxNext/Surgery/SurgerySystem.cs b/Content.Server/_CorvaxNext/Surgery/SurgerySystem.cs
deleted file mode 100644
index f9d69b57b81..00000000000
--- a/Content.Server/_CorvaxNext/Surgery/SurgerySystem.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-using Content.Server.Atmos.Rotting;
-using Content.Server.Body.Systems;
-using Content.Server.Chat.Systems;
-using Content.Shared.Body.Organ;
-using Content.Shared.Body.Part;
-using Content.Server.Popups;
-using Content.Shared.Damage;
-using Content.Shared.Interaction;
-using Content.Shared.Medical.Surgery.Conditions;
-using Content.Shared.Medical.Surgery.Effects.Step;
-using Content.Shared.Eye.Blinding.Components;
-using Content.Shared.Eye.Blinding.Systems;
-using Content.Shared.Prototypes;
-using Robust.Server.GameObjects;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-using System.Linq;
-using Content.Shared._CorvaxNext.Surgery;
-using Content.Shared._CorvaxNext.Surgery.Effects.Step;
-using Content.Shared._CorvaxNext.Surgery.Tools;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Medical.Surgery;
-using Content.Shared.Verbs;
-
-namespace Content.Server._CorvaxNext.Surgery;
-
-public sealed class SurgerySystem : SharedSurgerySystem
-{
-    [Dependency] private readonly BodySystem _body = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IPrototypeManager _prototypes = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly UserInterfaceSystem _ui = default!;
-    [Dependency] private readonly RottingSystem _rot = default!;
-    [Dependency] private readonly BlindableSystem _blindableSystem = default!;
-
-    private readonly List<EntProtoId> _surgeries = new();
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SurgeryToolComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
-        SubscribeLocalEvent<SurgeryTargetComponent, SurgeryStepDamageEvent>(OnSurgeryStepDamage);
-        // You might be wondering "why aren't we using StepEvent for these two?" reason being that StepEvent fires off regardless of success on the previous functions
-        // so this would heal entities even if you had a used or incorrect organ.
-        SubscribeLocalEvent<SurgerySpecialDamageChangeEffectComponent, SurgeryStepDamageChangeEvent>(OnSurgerySpecialDamageChange);
-        SubscribeLocalEvent<SurgeryDamageChangeEffectComponent, SurgeryStepDamageChangeEvent>(OnSurgeryDamageChange);
-        SubscribeLocalEvent<SurgeryStepEmoteEffectComponent, SurgeryStepEvent>(OnStepScreamComplete);
-        SubscribeLocalEvent<SurgeryStepSpawnEffectComponent, SurgeryStepEvent>(OnStepSpawnComplete);
-        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
-        LoadPrototypes();
-    }
-
-    protected override void RefreshUI(EntityUid body)
-    {
-        var surgeries = new Dictionary<NetEntity, List<EntProtoId>>();
-        foreach (var surgery in _surgeries)
-        {
-            if (GetSingleton(surgery) is not { } surgeryEnt)
-                continue;
-
-            foreach (var part in _body.GetBodyChildren(body))
-            {
-                var ev = new SurgeryValidEvent(body, part.Id);
-                RaiseLocalEvent(surgeryEnt, ref ev);
-
-                if (ev.Cancelled)
-                    continue;
-
-                surgeries.GetOrNew(GetNetEntity(part.Id)).Add(surgery);
-            }
-
-        }
-        //Logger.Debug($"Setting UI state with {surgeries}, {body} and {SurgeryUIKey.Key}");
-        _ui.SetUiState(body, SurgeryUIKey.Key, new SurgeryBuiState(surgeries));
-        /*
-            Reason we do this is because when applying a BUI State, it rolls back the state on the entity temporarily,
-            which just so happens to occur right as we're checking for step completion, so we end up with the UI
-            not updating at all until you change tools or reopen the window. I love shitcode.
-        */
-        _ui.ServerSendUiMessage(body, SurgeryUIKey.Key, new SurgeryBuiRefreshMessage());
-    }
-    private void SetDamage(EntityUid body,
-        DamageSpecifier damage,
-        float partMultiplier,
-        EntityUid user,
-        EntityUid part)
-    {
-        if (!TryComp<BodyPartComponent>(part, out var partComp))
-            return;
-
-        _damageable.TryChangeDamage(body,
-            damage,
-            true,
-            origin: user,
-            canSever: false,
-            partMultiplier: partMultiplier,
-            targetPart: _body.GetTargetBodyPart(partComp));
-    }
-
-    private void AttemptStartSurgery(Entity<SurgeryToolComponent> ent, EntityUid user, EntityUid target)
-    {
-        if (!IsLyingDown(target, user))
-            return;
-
-        if (user == target && !_config.GetCVar(Shared._CorvaxNext.NextVars.NextVars.CanOperateOnSelf))
-
-        {
-            _popup.PopupEntity(Loc.GetString("surgery-error-self-surgery"), user, user);
-            return;
-        }
-
-        _ui.OpenUi(target, SurgeryUIKey.Key, user);
-        RefreshUI(target);
-    }
-
-    private void OnUtilityVerb(Entity<SurgeryToolComponent> ent, ref GetVerbsEvent<UtilityVerb> args)
-    {
-        if (!args.CanInteract
-            || !args.CanAccess
-            || !HasComp<SurgeryTargetComponent>(args.Target))
-            return;
-
-        var user = args.User;
-        var target = args.Target;
-
-        var verb = new UtilityVerb()
-        {
-            Act = () => AttemptStartSurgery(ent, user, target),
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/"), "scalpel"),
-            Text = Loc.GetString("surgery-verb-text"),
-            Message = Loc.GetString("surgery-verb-message"),
-            DoContactInteraction = true
-        };
-
-        args.Verbs.Add(verb);
-    }
-
-    private void OnSurgeryStepDamage(Entity<SurgeryTargetComponent> ent, ref SurgeryStepDamageEvent args) =>
-        SetDamage(args.Body, args.Damage, args.PartMultiplier, args.User, args.Part);
-
-    private void OnSurgeryDamageChange(Entity<SurgeryDamageChangeEffectComponent> ent, ref SurgeryStepDamageChangeEvent args)
-    {
-        var damageChange = ent.Comp.Damage;
-        if (HasComp<ForcedSleepingComponent>(args.Body))
-            damageChange = damageChange * ent.Comp.SleepModifier;
-
-        SetDamage(args.Body, damageChange, 0.5f, args.User, args.Part);
-    }
-
-    private void OnSurgerySpecialDamageChange(Entity<SurgerySpecialDamageChangeEffectComponent> ent, ref SurgeryStepDamageChangeEvent args)
-    {
-        if (ent.Comp.DamageType == "Rot")
-            _rot.ReduceAccumulator(args.Body, TimeSpan.FromSeconds(2147483648)); // BEHOLD, SHITCODE THAT I JUST COPY PASTED. I'll redo it at some point, pinky swear :)
-        else if (ent.Comp.DamageType == "Eye"
-            && TryComp(ent, out BlindableComponent? blindComp)
-            && blindComp.EyeDamage > 0)
-            _blindableSystem.AdjustEyeDamage((args.Body, blindComp), -blindComp!.EyeDamage);
-    }
-
-    private void OnStepScreamComplete(Entity<SurgeryStepEmoteEffectComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (HasComp<ForcedSleepingComponent>(args.Body))
-            return;
-
-        _chat.TryEmoteWithChat(args.Body, ent.Comp.Emote);
-    }
-    private void OnStepSpawnComplete(Entity<SurgeryStepSpawnEffectComponent> ent, ref SurgeryStepEvent args) =>
-        SpawnAtPosition(ent.Comp.Entity, Transform(args.Body).Coordinates);
-
-    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
-    {
-        if (!args.WasModified<EntityPrototype>())
-            return;
-
-        LoadPrototypes();
-    }
-
-    private void LoadPrototypes()
-    {
-        _surgeries.Clear();
-        foreach (var entity in _prototypes.EnumeratePrototypes<EntityPrototype>())
-            if (entity.HasComponent<SurgeryComponent>())
-                _surgeries.Add(new EntProtoId(entity.ID));
-    }
-}
diff --git a/Content.Server/_CorvaxNext/Systems/DebrainedSystem.cs b/Content.Server/_CorvaxNext/Systems/DebrainedSystem.cs
deleted file mode 100644
index dab37fb4427..00000000000
--- a/Content.Server/_CorvaxNext/Systems/DebrainedSystem.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Content.Server._CorvaxNext.DelayedDeath;
-using Content.Shared.Body.Systems;
-using Content.Server.Popups;
-using Content.Shared._CorvaxNext.Surgery.Body;
-using Content.Shared._CorvaxNext.Surgery.Body.Organs;
-using Content.Shared.Speech;
-using Content.Shared.Standing;
-using Content.Shared.Stunnable;
-
-namespace Content.Server._CorvaxNext.Body.Systems;
-
-/// <summary>
-///     This system handles behavior on entities when they lose their head or their brains are removed.
-///     MindComponent fuckery should still be mainly handled on BrainSystem as usual.
-/// </summary>
-public sealed class DebrainedSystem : EntitySystem
-{
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DebrainedComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<DebrainedComponent, ComponentRemove>(OnComponentRemove);
-        SubscribeLocalEvent<DebrainedComponent, SpeakAttemptEvent>(OnSpeakAttempt);
-        SubscribeLocalEvent<DebrainedComponent, StandAttemptEvent>(OnStandAttempt);
-    }
-
-    private void OnComponentInit(EntityUid uid, DebrainedComponent _, ComponentInit args)
-    {
-        if (TerminatingOrDeleted(uid))
-            return;
-
-        EnsureComp<DelayedDeathComponent>(uid);
-        EnsureComp<StunnedComponent>(uid);
-        _standingSystem.Down(uid);
-    }
-
-    private void OnComponentRemove(EntityUid uid, DebrainedComponent _, ComponentRemove args)
-    {
-        if (TerminatingOrDeleted(uid))
-            return;
-
-        RemComp<DelayedDeathComponent>(uid);
-        RemComp<StunnedComponent>(uid);
-        if (_bodySystem.TryGetBodyOrganEntityComps<HeartComponent>(uid, out var _))
-            RemComp<DelayedDeathComponent>(uid);
-    }
-
-    private void OnSpeakAttempt(EntityUid uid, DebrainedComponent _, SpeakAttemptEvent args)
-    {
-        _popupSystem.PopupEntity(Loc.GetString("speech-muted"), uid, uid);
-        args.Cancel();
-    }
-
-    private void OnStandAttempt(EntityUid uid, DebrainedComponent _, StandAttemptEvent args)
-    {
-        args.Cancel();
-    }
-}
diff --git a/Content.Server/_CorvaxNext/Systems/EyesSystem.cs b/Content.Server/_CorvaxNext/Systems/EyesSystem.cs
deleted file mode 100644
index e3779ba7ed8..00000000000
--- a/Content.Server/_CorvaxNext/Systems/EyesSystem.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Body.Components;
-using Content.Shared._CorvaxNext.Surgery.Body.Organs;
-using Content.Shared.Eye.Blinding.Components;
-using Content.Shared.Eye.Blinding.Systems;
-
-namespace Content.Server._CorvaxNext.Body.Systems
-{
-    public sealed class EyesSystem : EntitySystem
-    {
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly BlindableSystem _blindableSystem = default!;
-        [Dependency] private readonly BodySystem _bodySystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<EyesComponent, OrganEnabledEvent>(OnOrganEnabled);
-            SubscribeLocalEvent<EyesComponent, OrganDisabledEvent>(OnOrganDisabled);
-        }
-
-        private void HandleSight(EntityUid newEntity, EntityUid oldEntity)
-        {
-            if (TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity))
-                return;
-
-            BlindableComponent? newSight;
-            BlindableComponent? oldSight;
-            //transfer existing component to organ
-            if (!TryComp(newEntity, out newSight))
-                newSight = EnsureComp<BlindableComponent>(newEntity);
-
-            if (!TryComp(oldEntity, out oldSight))
-                oldSight = EnsureComp<BlindableComponent>(oldEntity);
-
-            //give new sight all values of old sight
-            _blindableSystem.TransferBlindness(newSight, oldSight, newEntity);
-
-            var hasOtherEyes = false;
-            //check for other eye components on owning body and owning body organs (if old entity has a body)
-            if (TryComp<BodyComponent>(oldEntity, out var body))
-            {
-                if (TryComp<EyesComponent>(oldEntity, out var bodyEyes)) //some bodies see through their skin!!! (slimes)
-                    hasOtherEyes = true;
-                else
-                {
-                    foreach (var (organ, _) in _bodySystem.GetBodyOrgans(oldEntity, body))
-                    {
-                        if (TryComp<EyesComponent>(organ, out var eyes))
-                        {
-                            hasOtherEyes = true;
-                            break;
-                        }
-                    }
-                    //TODO (MS14): Should we do this for body parts too? might be a little overpowered but could be funny/interesting
-                }
-            }
-
-            //if there are no existing eye components for the old entity - set old sight to be blind otherwise leave it as is
-            if (!hasOtherEyes && !TryComp<EyesComponent>(oldEntity, out var self))
-                _blindableSystem.AdjustEyeDamage((oldEntity, oldSight), oldSight.MaxDamage);
-
-        }
-
-        private void OnOrganEnabled(EntityUid uid, EyesComponent component, OrganEnabledEvent args)
-        {
-            if (TerminatingOrDeleted(uid)
-            || args.Organ.Comp.Body is not { Valid: true } body)
-                return;
-
-            RemComp<TemporaryBlindnessComponent>(body);
-            HandleSight(uid, body);
-        }
-
-        private void OnOrganDisabled(EntityUid uid, EyesComponent component, OrganDisabledEvent args)
-        {
-            if (TerminatingOrDeleted(uid)
-            || args.Organ.Comp.Body is not { Valid: true } body)
-                return;
-
-            EnsureComp<TemporaryBlindnessComponent>(body);
-            HandleSight(body, uid);
-        }
-    }
-}
diff --git a/Content.Server/_CorvaxNext/Systems/HeartSystem.cs b/Content.Server/_CorvaxNext/Systems/HeartSystem.cs
deleted file mode 100644
index 9b8413c9af5..00000000000
--- a/Content.Server/_CorvaxNext/Systems/HeartSystem.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.Body.Events;
-using Content.Shared.Body.Organ;
-using Content.Server._CorvaxNext.DelayedDeath;
-using Content.Server.Body.Components;
-using Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-namespace Content.Server._CorvaxNext.Body.Systems;
-
-public sealed class HeartSystem : EntitySystem
-{
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<HeartComponent, OrganAddedToBodyEvent>(HandleAddition);
-        SubscribeLocalEvent<HeartComponent, OrganRemovedFromBodyEvent>(HandleRemoval);
-    }
-
-    private void HandleRemoval(EntityUid uid, HeartComponent _, ref OrganRemovedFromBodyEvent args)
-    {
-        if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.OldBody))
-            return;
-
-        // TODO: Add some form of very violent bleeding effect.
-        EnsureComp<DelayedDeathComponent>(args.OldBody);
-    }
-
-    private void HandleAddition(EntityUid uid, HeartComponent _, ref OrganAddedToBodyEvent args)
-    {
-        if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.Body))
-            return;
-
-        if (_bodySystem.TryGetBodyOrganEntityComps<BrainComponent>(args.Body, out var _))
-            RemComp<DelayedDeathComponent>(args.Body);
-    }
-    // CorvaxNext-End
-}
diff --git a/Content.Server/_CorvaxNext/Targeting/TargetingSystem.cs b/Content.Server/_CorvaxNext/Targeting/TargetingSystem.cs
deleted file mode 100644
index 3ff68b9ed69..00000000000
--- a/Content.Server/_CorvaxNext/Targeting/TargetingSystem.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Content.Shared._CorvaxNext.Targeting;
-using Content.Shared.Body.Systems;
-using Content.Shared.Mobs;
-
-namespace Content.Server._CorvaxNext.Targeting;
-public sealed class TargetingSystem : SharedTargetingSystem
-{
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeNetworkEvent<TargetChangeEvent>(OnTargetChange);
-        SubscribeLocalEvent<TargetingComponent, MobStateChangedEvent>(OnMobStateChange);
-    }
-
-    private void OnTargetChange(TargetChangeEvent message, EntitySessionEventArgs args)
-    {
-        if (!TryComp<TargetingComponent>(GetEntity(message.Uid), out var target))
-            return;
-
-        target.Target = message.BodyPart;
-        Dirty(GetEntity(message.Uid), target);
-    }
-
-    private void OnMobStateChange(EntityUid uid, TargetingComponent component, MobStateChangedEvent args)
-    {
-        // Revival is handled by the server, so we're keeping all of this here.
-        var changed = false;
-
-        if (args.NewMobState == MobState.Dead)
-        {
-            foreach (var part in GetValidParts())
-            {
-                component.BodyStatus[part] = TargetIntegrity.Dead;
-                changed = true;
-            }
-            // I love groin shitcode.
-            component.BodyStatus[TargetBodyPart.Groin] = TargetIntegrity.Dead;
-        }
-        else if (args.OldMobState == MobState.Dead && (args.NewMobState == MobState.Alive || args.NewMobState == MobState.Critical))
-        {
-            component.BodyStatus = _bodySystem.GetBodyPartStatus(uid);
-            changed = true;
-        }
-
-        if (changed)
-        {
-            Dirty(uid, component);
-            RaiseNetworkEvent(new TargetIntegrityChangeEvent(GetNetEntity(uid)), uid);
-        }
-    }
-}
diff --git a/Content.Server/_CorvaxNext/Traits/Assorted/ModifyMoodTraitComponent.cs b/Content.Server/_CorvaxNext/Traits/Assorted/ModifyMoodTraitComponent.cs
deleted file mode 100644
index 14b3f4a45ab..00000000000
--- a/Content.Server/_CorvaxNext/Traits/Assorted/ModifyMoodTraitComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Content.Server._CorvaxNext.Traits.Assorted;
-
-/// <summary>
-///     Used for traits that add a starting moodlet.
-/// </summary>
-[RegisterComponent]
-public sealed partial class MoodModifyTraitComponent : Component
-{
-    [DataField]
-    public string? MoodId;
-
-    [DataField]
-    public float GoodMoodMultiplier = 1.0f;
-
-    [DataField]
-    public float BadMoodMultiplier = 1.0f;
-}
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index 495f1dc2d24..90e1fd38e86 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Actions;
-using Content.Shared._CorvaxNext.Mood;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.ForceSay;
@@ -82,10 +81,7 @@ private void OnBedSleepAction(Entity<ActionsContainerComponent> ent, ref SleepAc
     private void OnWakeAction(Entity<MobStateComponent> ent, ref WakeActionEvent args)
     {
         if (TryWakeWithCooldown(ent.Owner))
-        {
-            RaiseLocalEvent(ent, new MoodEffectEvent("WokeUp")); // _CorvaxNext: mood
             args.Handled = true;
-        }
     }
 
     private void OnSleepAction(Entity<MobStateComponent> ent, ref SleepActionEvent args)
diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs
index c6e97a7e922..3048927b5fb 100644
--- a/Content.Shared/Body/Organ/OrganComponent.cs
+++ b/Content.Shared/Body/Organ/OrganComponent.cs
@@ -1,69 +1,16 @@
-using Content.Shared._CorvaxNext.Surgery.Tools;
 using Content.Shared.Body.Systems;
+using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Body.Organ;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedBodySystem))]
-public sealed partial class OrganComponent : Component, ISurgeryToolComponent
+public sealed partial class OrganComponent : Component
 {
     /// <summary>
     /// Relevant body this organ is attached to.
     /// </summary>
     [DataField, AutoNetworkedField]
     public EntityUid? Body;
-
-    // start-_CorvaxNext: surgery
-    /// <summary>
-    ///     Relevant body this organ originally belonged to.
-    ///     ///     FOR WHATEVER FUCKING REASON AUTONETWORKING THIS CRASHES GIBTEST AAAAAAAAAAAAAAA
-    /// </summary>
-    [DataField]
-    public EntityUid? OriginalBody;
-
-    /// <summary>
-    /// Shitcodey solution to not being able to know what name corresponds to each organ's slot ID
-    /// without referencing the prototype or hardcoding.
-    /// </summary>
-    [DataField, AlwaysPushInheritance]
-    public string SlotId = "";
-
-    [DataField, AlwaysPushInheritance]
-    public string ToolName { get; set; } = "An organ";
-
-    [DataField, AlwaysPushInheritance]
-    public float Speed { get; set; } = 1f;
-
-    /// <summary>
-    ///  If true, the organ will not heal an entity when transplanted into them.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool? Used { get; set; }
-
-    /// <summary>
-    ///     When attached, the organ will ensure these components on the entity, and delete them on removal.
-    /// </summary>
-    [DataField]
-    public ComponentRegistry? OnAdd;
-
-    /// <summary>
-    ///     When removed, the organ will ensure these components on the entity, and add them on removal.
-    /// </summary>
-    [DataField]
-    public ComponentRegistry? OnRemove;
-
-    /// <summary>
-    ///     Is this organ working or not?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled = true;
-
-    /// <summary>
-    ///     Can this organ be enabled or disabled? Used mostly for prop, damaged or useless organs.
-    /// </summary>
-    [DataField]
-    public bool CanEnable = true;
-    // end-_CorvaxNext: surgery
 }
diff --git a/Content.Shared/Body/Organ/TailComponent.cs b/Content.Shared/Body/Organ/TailComponent.cs
deleted file mode 100644
index 41c12ef2208..00000000000
--- a/Content.Shared/Body/Organ/TailComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Body.Organ;
-
-// start-_CorvaxNext: surgery
-[RegisterComponent]
-public sealed partial class TailComponent : Component;
-// end-_CorvaxNext: surgery
diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs
index ab1bec30212..c4e65c06a3f 100644
--- a/Content.Shared/Body/Part/BodyPartComponent.cs
+++ b/Content.Shared/Body/Part/BodyPartComponent.cs
@@ -1,19 +1,14 @@
-using Content.Shared._CorvaxNext.Surgery.Tools;
-using Content.Shared._CorvaxNext.Targeting;
-using Content.Shared.Body.Components;
+using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.FixedPoint;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
-using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Body.Part;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-//[Access(typeof(SharedBodySystem))]
-public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
+[Access(typeof(SharedBodySystem))]
+public sealed partial class BodyPartComponent : Component
 {
     // Need to set this on container changes as it may be several transform parents up the hierarchy.
     /// <summary>
@@ -22,133 +17,9 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     [DataField, AutoNetworkedField]
     public EntityUid? Body;
 
-    // start-_CorvaxNext: surgery
     [DataField, AutoNetworkedField]
-    public BodyPartSlot? ParentSlot;
-    // end-_CorvaxNext: surgery
-
-    // start-_CorvaxNext: surgery
-    /// <summary>
-    ///     CorvaxNext Change: Amount of damage to deal when the part gets removed.
-    ///     Only works if IsVital is true.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public FixedPoint2 VitalDamage = 100;
-    // end-_CorvaxNext: surgery
-
-    // start-_CorvaxNext: surgery
-    [DataField, AlwaysPushInheritance]
-    public string ToolName { get; set; } = "A body part";
-
-    [DataField, AlwaysPushInheritance]
-    public string SlotId { get; set; } = "";
-
-    [DataField, AutoNetworkedField]
-    public bool? Used { get; set; } = null;
-
-    [DataField, AlwaysPushInheritance]
-    public float Speed { get; set; } = 1f;
-
-    /// <summary>
-    /// CorvaxNext Change: What's the max health this body part can have?
-    /// </summary>
-    [DataField]
-    public float MinIntegrity;
-
-    /// <summary>
-    /// Whether this body part can be severed or not
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool CanSever = true;
-
-    /// <summary>
-    ///     CorvaxNext Change: Whether this body part is enabled or not.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled = true;
-
-    /// <summary>
-    ///     CorvaxNext Change: Whether this body part can be enabled or not. Used for non-functional prosthetics.
-    /// </summary>
-    [DataField]
-    public bool CanEnable = true;
-
-    /// <summary>
-    /// Whether this body part can attach children or not.
-    /// </summary>
-    [DataField]
-    public bool CanAttachChildren = true;
-
-    /// <summary>
-    ///     CorvaxNext Change: How long it takes to run another self heal tick on the body part.
-    /// </summary>
-    [DataField]
-    public float HealingTime = 30;
-
-    /// <summary>
-    ///     CorvaxNext Change: How long it has been since the last self heal tick on the body part.
-    /// </summary>
-    public float HealingTimer;
-
-    /// <summary>
-    ///     CorvaxNext Change: How much health to heal on the body part per tick.
-    /// </summary>
-    [DataField]
-    public float SelfHealingAmount = 5;
-
-    /// <summary>
-    ///     CorvaxNext Change: The name of the container for this body part. Used in insertion surgeries.
-    /// </summary>
-    [DataField]
-    public string ContainerName { get; set; } = "part_slot";
-
-    /// <summary>
-    ///     CorvaxNext Change: The slot for item insertion.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public ItemSlot ItemInsertionSlot = new();
-
-
-    /// <summary>
-    ///     CorvaxNext Change: Current species. Dictates things like body part sprites.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public string Species { get; set; } = "";
-
-    /// <summary>
-    ///     CorvaxNext Change: The total damage that has to be dealt to a body part
-    ///     to make possible severing it.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float SeverIntegrity = 90;
-
-    /// <summary>
-    ///     CorvaxNext Change: The ID of the base layer for this body part.
-    /// </summary>
-    [DataField, AutoNetworkedField, AlwaysPushInheritance]
-    public string? BaseLayerId;
-
-    /// <summary>
-    ///     CorvaxNext Change: On what TargetIntegrity we should re-enable the part.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public TargetIntegrity EnableIntegrity = TargetIntegrity.ModeratelyWounded;
-
-    [DataField, AutoNetworkedField]
-    public Dictionary<TargetIntegrity, float> IntegrityThresholds = new()
-    {
-        { TargetIntegrity.CriticallyWounded, 75 },
-        { TargetIntegrity.HeavilyWounded, 60 },
-        { TargetIntegrity.ModeratelyWounded, 50 },
-        { TargetIntegrity.SomewhatWounded, 35 },
-        { TargetIntegrity.LightlyWounded, 20 },
-        { TargetIntegrity.Healthy, 10 },
-    };
-
-    [DataField, AutoNetworkedField, AlwaysPushInheritance]
     public BodyPartType PartType = BodyPartType.Other;
 
-
     // TODO BODY Replace with a simulation of organs
     /// <summary>
     ///     Whether or not the owning <see cref="Body"/> will die if all
@@ -158,19 +29,7 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     public bool IsVital;
 
     [DataField, AutoNetworkedField]
-    public BodyPartSymmetry Symmetry { get; set; } = BodyPartSymmetry.None;
-
-    /// <summary>
-    ///     When attached, the part will ensure these components on the entity, and delete them on removal.
-    /// </summary>
-    [DataField, AlwaysPushInheritance]
-    public ComponentRegistry? OnAdd;
-
-    /// <summary>
-    ///     When removed, the part will ensure these components on the entity, and add them on removal.
-    /// </summary>
-    [DataField, AlwaysPushInheritance]
-    public ComponentRegistry? OnRemove;
+    public BodyPartSymmetry Symmetry = BodyPartSymmetry.None;
 
     /// <summary>
     /// Child body parts attached to this body part.
@@ -184,8 +43,6 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     [DataField, AutoNetworkedField]
     public Dictionary<string, OrganSlot> Organs = new();
 
-    // end-_CorvaxNext: surgery Change End
-
     /// <summary>
     /// These are only for VV/Debug do not use these for gameplay/systems
     /// </summary>
@@ -199,7 +56,7 @@ private List<ContainerSlot> BodyPartSlotsVV
 
             foreach (var slotId in Children.Keys)
             {
-                temp.Add((ContainerSlot)containerSystem.GetContainer(Owner, SharedBodySystem.PartSlotContainerIdPrefix + slotId));
+                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, SharedBodySystem.PartSlotContainerIdPrefix+slotId));
             }
 
             return temp;
@@ -216,7 +73,7 @@ private List<ContainerSlot> OrganSlotsVV
 
             foreach (var slotId in Organs.Keys)
             {
-                temp.Add((ContainerSlot)containerSystem.GetContainer(Owner, SharedBodySystem.OrganSlotContainerIdPrefix + slotId));
+                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, SharedBodySystem.OrganSlotContainerIdPrefix+slotId));
             }
 
             return temp;
diff --git a/Content.Shared/Body/Part/BodyPartEvents.cs b/Content.Shared/Body/Part/BodyPartEvents.cs
new file mode 100644
index 00000000000..0d8d2c8a268
--- /dev/null
+++ b/Content.Shared/Body/Part/BodyPartEvents.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Body.Part;
+
+[ByRefEvent]
+public readonly record struct BodyPartAddedEvent(string Slot, Entity<BodyPartComponent> Part);
+
+[ByRefEvent]
+public readonly record struct BodyPartRemovedEvent(string Slot, Entity<BodyPartComponent> Part);
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index 138291eff13..250f90db8f3 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -1,30 +1,19 @@
 using System.Linq;
 using System.Numerics;
-using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Prototypes;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Damage;
 using Content.Shared.DragDrop;
-using Content.Shared.FixedPoint;
 using Content.Shared.Gibbing.Components;
 using Content.Shared.Gibbing.Events;
 using Content.Shared.Gibbing.Systems;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Events;
 using Content.Shared.Inventory;
-using Content.Shared.Inventory.Events;
-using Content.Shared.Rejuvenate;
-using Content.Shared.Silicons.Borgs.Components;
-using Content.Shared.Standing;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
-using Robust.Shared.Timing;
 
 namespace Content.Shared.Body.Systems;
 
@@ -38,10 +27,9 @@ public partial class SharedBodySystem
      */
 
     [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly ItemSlotsSystem _slots = default!;
     [Dependency] private readonly GibbingSystem _gibbingSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
     private const float GibletLaunchImpulse = 8;
     private const float GibletLaunchImpulseVariance = 3;
 
@@ -54,10 +42,6 @@ private void InitializeBody()
         SubscribeLocalEvent<BodyComponent, ComponentInit>(OnBodyInit);
         SubscribeLocalEvent<BodyComponent, MapInitEvent>(OnBodyMapInit);
         SubscribeLocalEvent<BodyComponent, CanDragEvent>(OnBodyCanDrag);
-
-        SubscribeLocalEvent<BodyComponent, StandAttemptEvent>(OnStandAttempt);
-        SubscribeLocalEvent<BodyComponent, ProfileLoadFinishedEvent>(OnProfileLoadFinished);
-        SubscribeLocalEvent<BodyComponent, IsEquippingAttemptEvent>(OnBeingEquippedAttempt);
     }
 
     private void OnBodyInserted(Entity<BodyComponent> ent, ref EntInsertedIntoContainerMessage args)
@@ -132,9 +116,10 @@ private void MapInitBody(EntityUid bodyEntity, BodyPrototype prototype)
         var rootPart = Comp<BodyPartComponent>(rootPartUid);
         rootPart.Body = bodyEntity;
         Dirty(rootPartUid, rootPart);
+
         // Setup the rest of the body entities.
         SetupOrgans((rootPartUid, rootPart), protoRoot.Organs);
-        MapInitParts(rootPartUid, rootPart, prototype);
+        MapInitParts(rootPartUid, prototype);
     }
 
     private void OnBodyCanDrag(Entity<BodyComponent> ent, ref CanDragEvent args)
@@ -142,18 +127,10 @@ private void OnBodyCanDrag(Entity<BodyComponent> ent, ref CanDragEvent args)
         args.Handled = true;
     }
 
-    // start-_CorvaxNext: surgery
-    private void OnStandAttempt(Entity<BodyComponent> ent, ref StandAttemptEvent args)
-    {
-        if (!HasComp<BorgChassisComponent>(ent) && ent.Comp.LegEntities.Count == 0)
-            args.Cancel();
-    }
-    // end-_CorvaxNext: surgery
-
     /// <summary>
     /// Sets up all of the relevant body parts for a particular body entity and root part.
     /// </summary>
-    private void MapInitParts(EntityUid rootPartId, BodyPartComponent rootPart, BodyPrototype prototype)
+    private void MapInitParts(EntityUid rootPartId, BodyPrototype prototype)
     {
         // Start at the root part and traverse the body graph, setting up parts as we go.
         // Basic BFS pathfind.
@@ -191,8 +168,6 @@ private void MapInitParts(EntityUid rootPartId, BodyPartComponent rootPart, Body
 
                 var childPartComponent = Comp<BodyPartComponent>(childPart);
                 var partSlot = CreatePartSlot(parentEntity, connection, childPartComponent.PartType, parentPartComponent);
-                childPartComponent.ParentSlot = partSlot;
-                Dirty(childPart, childPartComponent);
                 var cont = Containers.GetContainer(parentEntity, GetPartSlotContainerId(connection));
 
                 if (partSlot is null || !Containers.Insert(childPart, cont))
@@ -202,22 +177,6 @@ private void MapInitParts(EntityUid rootPartId, BodyPartComponent rootPart, Body
                     continue;
                 }
 
-                // // start-_CorvaxNext: surgery
-                // if (TryComp(parentPartComponent.Body, out HumanoidAppearanceComponent? bodyAppearance))
-                // {
-                //     var appearance = AddComp<BodyPartAppearanceComponent>(childPart);
-                //     appearance.OriginalBody = childPartComponent.OriginalBody;
-                //     appearance.Color = bodyAppearance.SkinColor;
-                //
-                //     var symmetry = ((BodyPartSymmetry) childPartComponent.Symmetry).ToString();
-                //     if (symmetry == "None")
-                //         symmetry = "";
-                //     appearance.ID = "removed" + symmetry + ((BodyPartType) childPartComponent.PartType).ToString();
-                //
-                //     Dirty(childPart, appearance);
-                // }
-                // // end-_CorvaxNext: surgery
-
                 // Add organs
                 SetupOrgans((childPart, childPartComponent), connectionSlot.Organs);
 
@@ -274,11 +233,11 @@ public IEnumerable<BaseContainer> GetBodyContainers(
     {
         if (id is null
             || !Resolve(id.Value, ref body, logMissing: false)
-            || body is null
-            || body.RootContainer == default
             || body.RootContainer.ContainedEntity is null
             || !Resolve(body.RootContainer.ContainedEntity.Value, ref rootPart))
+        {
             yield break;
+        }
 
         foreach (var child in GetBodyPartChildren(body.RootContainer.ContainedEntity.Value, rootPart))
         {
@@ -332,9 +291,7 @@ public virtual HashSet<EntityUid> GibBody(
         Vector2? splatDirection = null,
         float splatModifier = 1,
         Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null,
-        GibType gib = GibType.Gib,
-        GibContentsOption contents = GibContentsOption.Drop)
+        SoundSpecifier? gibSoundOverride = null)
     {
         var gibs = new HashSet<EntityUid>();
 
@@ -351,9 +308,9 @@ public virtual HashSet<EntityUid> GibBody(
         foreach (var part in parts)
         {
 
-            _gibbingSystem.TryGibEntityWithRef(bodyId, part.Id, gib, contents, ref gibs,
-                playAudio: false, launchGibs: true, launchDirection: splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
-                launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
+            _gibbingSystem.TryGibEntityWithRef(bodyId, part.Id, GibType.Gib, GibContentsOption.Skip, ref gibs,
+                playAudio: false, launchGibs:true, launchDirection:splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
+                launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
 
             if (!gibOrgans)
                 continue;
@@ -362,7 +319,7 @@ public virtual HashSet<EntityUid> GibBody(
             {
                 _gibbingSystem.TryGibEntityWithRef(bodyId, organ.Id, GibType.Drop, GibContentsOption.Skip,
                     ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
-                    launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
+                    launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
             }
         }
 
@@ -378,100 +335,4 @@ public virtual HashSet<EntityUid> GibBody(
         _audioSystem.PlayPredicted(gibSoundOverride, bodyTransform.Coordinates, null);
         return gibs;
     }
-
-    // start-_CorvaxNext: surgery
-    public virtual HashSet<EntityUid> GibPart(
-        EntityUid partId,
-        BodyPartComponent? part = null,
-        bool launchGibs = true,
-        Vector2? splatDirection = null,
-        float splatModifier = 1,
-        Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null)
-    {
-        var gibs = new HashSet<EntityUid>();
-
-        if (!Resolve(partId, ref part, logMissing: false))
-            return gibs;
-
-        if (part.Body is { } bodyEnt)
-        {
-            if (IsPartRoot(bodyEnt, partId, part: part) || !part.CanSever)
-                return gibs;
-
-            DropSlotContents((partId, part));
-            RemovePartChildren((partId, part), bodyEnt);
-            foreach (var organ in GetPartOrgans(partId, part))
-            {
-                _gibbingSystem.TryGibEntityWithRef(bodyEnt, organ.Id, GibType.Drop, GibContentsOption.Skip,
-                    ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
-                    launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
-            }
-        }
-
-        // Corvax-Next-Surgery
-        _gibbingSystem.TryGibEntityWithRef(partId, partId, GibType.Gib, GibContentsOption.Drop, ref gibs,
-                playAudio: true, launchGibs: true, launchDirection: splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
-                launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
-
-
-        if (HasComp<InventoryComponent>(partId))
-        {
-            foreach (var item in _inventory.GetHandOrInventoryEntities(partId))
-            {
-                SharedTransform.AttachToGridOrMap(item);
-                gibs.Add(item);
-            }
-        }
-        _audioSystem.PlayPredicted(gibSoundOverride, Transform(partId).Coordinates, null);
-        return gibs;
-    }
-
-    public virtual bool BurnPart(EntityUid partId,
-        BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false))
-            return false;
-
-        if (part.Body is { } bodyEnt)
-        {
-            if (IsPartRoot(bodyEnt, partId, part: part))
-                return false;
-
-            DropSlotContents((partId, part));
-            RemovePartChildren((partId, part), bodyEnt);
-            QueueDel(partId);
-            return true;
-        }
-
-        return false;
-    }
-
-    private void OnProfileLoadFinished(EntityUid uid, BodyComponent component, ProfileLoadFinishedEvent args)
-    {
-        if (!HasComp<HumanoidAppearanceComponent>(uid)
-            || TerminatingOrDeleted(uid))
-            return;
-
-        foreach (var part in GetBodyChildren(uid, component))
-            EnsureComp<BodyPartAppearanceComponent>(part.Id);
-    }
-
-
-    private void OnBeingEquippedAttempt(Entity<BodyComponent> ent, ref IsEquippingAttemptEvent args)
-    {
-        TryGetPartFromSlotContainer(args.Slot, out var bodyPart);
-        if (bodyPart is not null)
-        {
-            if (!GetBodyChildrenOfType(args.EquipTarget, bodyPart.Value).Any())
-            {
-                if (_timing.IsFirstTimePredicted)
-                    _popup.PopupEntity(Loc.GetString("equip-part-missing-error",
-                        ("target", args.EquipTarget), ("part", bodyPart.Value.ToString())), args.Equipee, args.Equipee);
-                args.Cancel();
-            }
-        }
-    }
-
-    // Shitmed Change End
 }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
index 890b83e5341..f83dd50c998 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
@@ -1,34 +1,14 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared._CorvaxNext.Surgery.Body.Organs;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
-using Content.Shared.Damage;
 using Robust.Shared.Containers;
 
-// CorvaxNext: surgery
-
 namespace Content.Shared.Body.Systems;
 
 public partial class SharedBodySystem
 {
-    // start-_CorvaxNext: surgery Change Start
-
-    private void InitializeOrgans()
-    {
-        SubscribeLocalEvent<OrganComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<OrganComponent, OrganEnableChangedEvent>(OnOrganEnableChanged);
-    }
-
-    private void OnMapInit(Entity<OrganComponent> ent, ref MapInitEvent args)
-    {
-        if (ent.Comp.OnAdd is not null || ent.Comp.OnRemove is not null)
-            EnsureComp<OrganEffectComponent>(ent);
-    }
-
-    // end-_CorvaxNext: surgery Change End
-
     private void AddOrgan(
         Entity<OrganComponent> organEnt,
         EntityUid bodyUid,
@@ -40,20 +20,10 @@ private void AddOrgan(
 
         if (organEnt.Comp.Body is not null)
         {
-            organEnt.Comp.OriginalBody = organEnt.Comp.Body; // CorvaxNext: surgery
-            organEnt.Comp.OriginalBody = organEnt.Comp.Body; // CorvaxNext: surgery Change
             var addedInBodyEv = new OrganAddedToBodyEvent(bodyUid, parentPartUid);
             RaiseLocalEvent(organEnt, ref addedInBodyEv);
-            var organEnabledEv = new OrganEnableChangedEvent(true);
-            RaiseLocalEvent(organEnt, ref organEnabledEv); // CorvaxNext: surgery
         }
 
-        // start-_CorvaxNext: surgery Change Start
-        if (TryComp(parentPartUid, out DamageableComponent? damageable)
-            && damageable.TotalDamage > 200)
-            TrySetOrganUsed(organEnt, true, organEnt.Comp);
-        // end-_CorvaxNext: surgery Change End
-
         Dirty(organEnt, organEnt.Comp);
     }
 
@@ -64,21 +34,10 @@ private void RemoveOrgan(Entity<OrganComponent> organEnt, EntityUid parentPartUi
 
         if (organEnt.Comp.Body is { Valid: true } bodyUid)
         {
-            // start-_CorvaxNext: surgery Change Start
-            organEnt.Comp.OriginalBody = organEnt.Comp.Body;
-            var organDisabledEv = new OrganEnableChangedEvent(false);
-            RaiseLocalEvent(organEnt, ref organDisabledEv);
-            // end-_CorvaxNext: surgery Change End
             var removedInBodyEv = new OrganRemovedFromBodyEvent(bodyUid, parentPartUid);
             RaiseLocalEvent(organEnt, ref removedInBodyEv);
         }
 
-
-        if (parentPartUid is { Valid: true }
-            && TryComp(parentPartUid, out DamageableComponent? damageable)
-            && damageable.TotalDamage > 200)
-            TrySetOrganUsed(organEnt, true, organEnt.Comp);
-
         organEnt.Comp.Body = null;
         Dirty(organEnt, organEnt.Comp);
     }
@@ -250,63 +209,4 @@ public bool TryGetBodyOrganEntityComps<T>(
         comps = null;
         return false;
     }
-
-    // start-_CorvaxNext: surgery Change Start
-
-    public bool TrySetOrganUsed(EntityUid organId, bool used, OrganComponent? organ = null)
-    {
-        if (!Resolve(organId, ref organ)
-            || organ.Used == used)
-            return false;
-
-        organ.Used = used;
-        Dirty(organId, organ);
-        return true;
-    }
-
-    private void OnOrganEnableChanged(Entity<OrganComponent> organEnt, ref OrganEnableChangedEvent args)
-    {
-        if (!organEnt.Comp.CanEnable && args.Enabled)
-            return;
-
-        organEnt.Comp.Enabled = args.Enabled;
-
-        if (args.Enabled)
-            EnableOrgan(organEnt);
-        else
-            DisableOrgan(organEnt);
-
-        if (organEnt.Comp.Body is { Valid: true } bodyEnt)
-            RaiseLocalEvent(organEnt, new OrganComponentsModifyEvent(bodyEnt, args.Enabled));
-
-        Dirty(organEnt, organEnt.Comp);
-    }
-
-    private void EnableOrgan(Entity<OrganComponent> organEnt)
-    {
-        if (!TryComp(organEnt.Comp.Body, out BodyComponent? body))
-            return;
-
-        // I hate having to hardcode these checks so much.
-        if (HasComp<EyesComponent>(organEnt))
-        {
-            var ev = new OrganEnabledEvent(organEnt);
-            RaiseLocalEvent(organEnt, ref ev);
-        }
-    }
-
-    private void DisableOrgan(Entity<OrganComponent> organEnt)
-    {
-        if (!TryComp(organEnt.Comp.Body, out BodyComponent? body))
-            return;
-
-        // I hate having to hardcode these checks so much.
-        if (HasComp<EyesComponent>(organEnt))
-        {
-            var ev = new OrganDisabledEvent(organEnt);
-            RaiseLocalEvent(organEnt, ref ev);
-        }
-    }
-
-    // end-_CorvaxNext: surgery Change End
 }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index 94ad56b7368..0917197e29f 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -1,165 +1,28 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
-using Content.Shared.Humanoid;
-using Content.Shared.Inventory;
 using Content.Shared.Movement.Components;
-using Content.Shared.Random;
-using Content.Shared._CorvaxNext.Targeting;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
-using Content.Shared._CorvaxNext.Surgery.Body.Organs;
-using AmputateAttemptEvent = Content.Shared.Body.Events.AmputateAttemptEvent;
-using Content.Shared._CorvaxNext.Mood;
 
 namespace Content.Shared.Body.Systems;
 
 public partial class SharedBodySystem
 {
-    [Dependency] private readonly RandomHelperSystem _randomHelper = default!;
-    [Dependency] private readonly InventorySystem _inventorySystem = default!;
-
     private void InitializeParts()
     {
         // TODO: This doesn't handle comp removal on child ents.
 
         // If you modify this also see the Body partial for root parts.
-
         SubscribeLocalEvent<BodyPartComponent, EntInsertedIntoContainerMessage>(OnBodyPartInserted);
         SubscribeLocalEvent<BodyPartComponent, EntRemovedFromContainerMessage>(OnBodyPartRemoved);
-
-        // Shitmed Change Start
-        SubscribeLocalEvent<BodyPartComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<BodyPartComponent, ComponentRemove>(OnBodyPartRemove);
-        SubscribeLocalEvent<BodyPartComponent, AmputateAttemptEvent>(OnAmputateAttempt);
-        SubscribeLocalEvent<BodyPartComponent, BodyPartEnableChangedEvent>(OnPartEnableChanged);
-    }
-
-    // start-_CorvaxNext: surgery
-    private void OnMapInit(Entity<BodyPartComponent> ent, ref MapInitEvent args)
-    {
-        if (ent.Comp.PartType == BodyPartType.Torso)
-        {
-            _slots.AddItemSlot(ent, ent.Comp.ContainerName, ent.Comp.ItemInsertionSlot);
-            Dirty(ent, ent.Comp);
-        }
-
-        if (ent.Comp.OnAdd is not null || ent.Comp.OnRemove is not null)
-            EnsureComp<BodyPartEffectComponent>(ent);
-
-        foreach (var connection in ent.Comp.Children.Keys)
-        {
-            Containers.EnsureContainer<ContainerSlot>(ent, GetPartSlotContainerId(connection));
-        }
-    }
-
-    private void OnBodyPartRemove(Entity<BodyPartComponent> ent, ref ComponentRemove args)
-    {
-        if (ent.Comp.PartType == BodyPartType.Torso)
-            _slots.RemoveItemSlot(ent, ent.Comp.ItemInsertionSlot);
-    }
-
-    private void OnPartEnableChanged(Entity<BodyPartComponent> partEnt, ref BodyPartEnableChangedEvent args)
-    {
-        if (!partEnt.Comp.CanEnable && args.Enabled)
-            return;
-
-        partEnt.Comp.Enabled = args.Enabled;
-
-        if (args.Enabled)
-        {
-            EnablePart(partEnt);
-            if (partEnt.Comp.Body is { Valid: true } bodyEnt)
-                RaiseLocalEvent(partEnt, new BodyPartComponentsModifyEvent(bodyEnt, true));
-        }
-        else
-        {
-            DisablePart(partEnt);
-            if (partEnt.Comp.Body is { Valid: true } bodyEnt)
-                RaiseLocalEvent(partEnt, new BodyPartComponentsModifyEvent(bodyEnt, false));
-        }
-
-        Dirty(partEnt, partEnt.Comp);
-    }
-
-    /// <summary>
-    ///     Shitmed Change: This function handles dropping the items in an entity's slots if they lose all of a given part.
-    ///     Such as their hands, feet, head, etc.
-    /// </summary>
-    public void DropSlotContents(Entity<BodyPartComponent> partEnt)
-    {
-        if (partEnt.Comp.Body is not null
-            && TryComp<InventoryComponent>(partEnt.Comp.Body, out var inventory) // Prevent error for non-humanoids
-            && GetBodyPartCount(partEnt.Comp.Body.Value, partEnt.Comp.PartType) == 1
-            && TryGetPartSlotContainerName(partEnt.Comp.PartType, out var containerNames))
-        {
-            foreach (var containerName in containerNames)
-                _inventorySystem.DropSlotContents(partEnt.Comp.Body.Value, containerName, inventory);
-        }
-
-    }
-
-    // TODO: Refactor this crap. I hate it so much.
-    private void RemovePartEffect(Entity<BodyPartComponent> partEnt, Entity<BodyComponent?> bodyEnt)
-    {
-        if (TerminatingOrDeleted(bodyEnt)
-            || !Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
-            return;
-
-        RemovePartChildren(partEnt, bodyEnt, bodyEnt.Comp);
     }
 
-    protected void RemovePartChildren(Entity<BodyPartComponent> partEnt, EntityUid bodyEnt, BodyComponent? body = null)
-    {
-        if (!Resolve(bodyEnt, ref body, logMissing: false))
-            return;
-
-        if (partEnt.Comp.Children.Any())
-        {
-            foreach (var slotId in partEnt.Comp.Children.Keys)
-            {
-                if (Containers.TryGetContainer(partEnt, GetPartSlotContainerId(slotId), out var container) &&
-                    container is ContainerSlot slot &&
-                    slot.ContainedEntity is { } childEntity &&
-                    TryComp(childEntity, out BodyPartComponent? childPart))
-                {
-                    var ev = new BodyPartEnableChangedEvent(false);
-                    RaiseLocalEvent(childEntity, ref ev);
-                    DropPart((childEntity, childPart));
-                }
-            }
-
-            Dirty(bodyEnt, body);
-        }
-    }
-
-    protected virtual void DropPart(Entity<BodyPartComponent> partEnt)
-    {
-        DropSlotContents(partEnt);
-        // I don't know if this can cause issues, since any part that's being detached HAS to have a Body.
-        // though I really just want the compiler to shut the fuck up.
-        var body = partEnt.Comp.Body.GetValueOrDefault();
-        if (TryComp(partEnt, out TransformComponent? transform) && _gameTiming.IsFirstTimePredicted)
-        {
-            var enableEvent = new BodyPartEnableChangedEvent(false);
-            RaiseLocalEvent(partEnt, ref enableEvent);
-            var droppedEvent = new BodyPartDroppedEvent(partEnt);
-            RaiseLocalEvent(body, ref droppedEvent);
-            SharedTransform.AttachToGridOrMap(partEnt, transform);
-            _randomHelper.RandomOffset(partEnt, 0.5f);
-        }
-    }
-
-    private void OnAmputateAttempt(Entity<BodyPartComponent> partEnt, ref AmputateAttemptEvent args) =>
-        DropPart(partEnt);
-
-    // end-_CorvaxNext: surgery Change End
     private void OnBodyPartInserted(Entity<BodyPartComponent> ent, ref EntInsertedIntoContainerMessage args)
     {
         // Body part inserted into another body part.
@@ -169,17 +32,14 @@ private void OnBodyPartInserted(Entity<BodyPartComponent> ent, ref EntInsertedIn
         if (ent.Comp.Body is null)
             return;
 
-        if (TryComp(insertedUid, out BodyPartComponent? part) && slotId.Contains(PartSlotContainerIdPrefix + GetSlotFromBodyPart(part))) // Shitmed Change
+        if (TryComp(insertedUid, out BodyPartComponent? part))
         {
             AddPart(ent.Comp.Body.Value, (insertedUid, part), slotId);
             RecursiveBodyUpdate((insertedUid, part), ent.Comp.Body.Value);
-            CheckBodyPart((insertedUid, part), GetTargetBodyPart(part), false); // Shitmed Change
         }
 
-        if (TryComp(insertedUid, out OrganComponent? organ) && slotId.Contains(OrganSlotContainerIdPrefix + organ.SlotId)) // Shitmed Change
-        {
+        if (TryComp(insertedUid, out OrganComponent? organ))
             AddOrgan((insertedUid, organ), ent.Comp.Body.Value, ent);
-        }
     }
 
     private void OnBodyPartRemoved(Entity<BodyPartComponent> ent, ref EntRemovedFromContainerMessage args)
@@ -188,32 +48,17 @@ private void OnBodyPartRemoved(Entity<BodyPartComponent> ent, ref EntRemovedFrom
         var removedUid = args.Entity;
         var slotId = args.Container.ID;
 
-        // Shitmed Change Start
-        if (TryComp(removedUid, out BodyPartComponent? part))
-        {
-            if (!slotId.Contains(PartSlotContainerIdPrefix + GetSlotFromBodyPart(part)))
-                return;
-
-            DebugTools.Assert(part.Body == ent.Comp.Body);
+        DebugTools.Assert(!TryComp(removedUid, out BodyPartComponent? b) || b.Body == ent.Comp.Body);
+        DebugTools.Assert(!TryComp(removedUid, out OrganComponent? o) || o.Body == ent.Comp.Body);
 
-            if (part.Body is not null)
-            {
-                CheckBodyPart((removedUid, part), GetTargetBodyPart(part), true);
-                RemovePart(part.Body.Value, (removedUid, part), slotId);
-                RecursiveBodyUpdate((removedUid, part), null);
-            }
+        if (TryComp(removedUid, out BodyPartComponent? part) && part.Body is not null)
+        {
+            RemovePart(part.Body.Value, (removedUid, part), slotId);
+            RecursiveBodyUpdate((removedUid, part), null);
         }
 
         if (TryComp(removedUid, out OrganComponent? organ))
-        {
-            if (!slotId.Contains(OrganSlotContainerIdPrefix + organ.SlotId))
-                return;
-
-            DebugTools.Assert(organ.Body == ent.Comp.Body);
-
             RemoveOrgan((removedUid, organ), ent);
-        }
-        // Shitmed Change End
     }
 
     private void RecursiveBodyUpdate(Entity<BodyPartComponent> ent, EntityUid? bodyUid)
@@ -248,8 +93,6 @@ private void RecursiveBodyUpdate(Entity<BodyPartComponent> ent, EntityUid? bodyU
             }
         }
 
-        // The code for RemovePartEffect() should live here, because it literally is the point of this recursive function.
-        // But the debug asserts at the top plus existing tests need refactoring for this. So we'll be lazy.
         foreach (var slotId in ent.Comp.Children.Keys)
         {
             if (!Containers.TryGetContainer(ent, GetPartSlotContainerId(slotId), out var container))
@@ -271,9 +114,6 @@ protected virtual void AddPart(
         Dirty(partEnt, partEnt.Comp);
         partEnt.Comp.Body = bodyEnt;
 
-        if (partEnt.Comp.Enabled && partEnt.Comp.Body is { Valid: true } body) // CorvaxNext: surgery Change
-            RaiseLocalEvent(partEnt, new BodyPartComponentsModifyEvent(body, true));
-
         var ev = new BodyPartAddedEvent(slotId, partEnt);
         RaiseLocalEvent(bodyEnt, ref ev);
 
@@ -287,18 +127,12 @@ protected virtual void RemovePart(
     {
         Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false);
         Dirty(partEnt, partEnt.Comp);
-
-
-        // Shitmed Change Start
-        if (partEnt.Comp.Body is { Valid: true } body)
-            RaiseLocalEvent(partEnt, new BodyPartComponentsModifyEvent(body, false));
-        partEnt.Comp.ParentSlot = null;
-        // end-_CorvaxNext: surgery Change End
+        partEnt.Comp.Body = null;
 
         var ev = new BodyPartRemovedEvent(slotId, partEnt);
         RaiseLocalEvent(bodyEnt, ref ev);
+
         RemoveLeg(partEnt, bodyEnt);
-        RemovePartEffect(partEnt, bodyEnt);
         PartRemoveDamage(bodyEnt, partEnt);
     }
 
@@ -325,7 +159,11 @@ private void RemoveLeg(Entity<BodyPartComponent> legEnt, Entity<BodyComponent?>
             bodyEnt.Comp.LegEntities.Remove(legEnt);
             UpdateMovementSpeed(bodyEnt);
             Dirty(bodyEnt, bodyEnt.Comp);
-            Standing.Down(bodyEnt); // CorvaxNext: surgery
+
+            if (!bodyEnt.Comp.LegEntities.Any())
+            {
+                Standing.Down(bodyEnt);
+            }
         }
     }
 
@@ -339,85 +177,12 @@ private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartCom
             && !GetBodyChildrenOfType(bodyEnt, partEnt.Comp.PartType, bodyEnt.Comp).Any()
         )
         {
-            // start-_CorvaxNext: surgery
-            var damage = new DamageSpecifier(Prototypes.Index<DamageTypePrototype>("Bloodloss"), partEnt.Comp.VitalDamage);
-            Damageable.TryChangeDamage(bodyEnt, damage, partMultiplier: 0f);
-            // end-_CorvaxNext: surgery
+            // TODO BODY SYSTEM KILL : remove this when wounding and required parts are implemented properly
+            var damage = new DamageSpecifier(Prototypes.Index<DamageTypePrototype>("Bloodloss"), 300);
+            Damageable.TryChangeDamage(bodyEnt, damage);
         }
     }
 
-    private void EnablePart(Entity<BodyPartComponent> partEnt)
-    {
-        if (!TryComp(partEnt.Comp.Body, out BodyComponent? body))
-            return;
-
-        // I hate having to hardcode these checks so much.
-        if (partEnt.Comp.PartType == BodyPartType.Leg)
-        {
-            AddLeg(partEnt, (partEnt.Comp.Body.Value, body));
-            RaiseLocalEvent(partEnt.Comp.Body.Value, new MoodRemoveEffectEvent("SurgeryNoLeg"));
-        }
-
-        if (partEnt.Comp.PartType == BodyPartType.Arm)
-        {
-            var hand = GetBodyChildrenOfType(partEnt.Comp.Body.Value, BodyPartType.Hand, symmetry: partEnt.Comp.Symmetry).FirstOrDefault();
-            if (hand != default)
-            {
-                var ev = new BodyPartEnabledEvent(hand);
-                RaiseLocalEvent(partEnt.Comp.Body.Value, ref ev);
-            }
-        }
-
-        if (partEnt.Comp.PartType == BodyPartType.Hand)
-        {
-            var ev = new BodyPartEnabledEvent(partEnt);
-            RaiseLocalEvent(partEnt.Comp.Body.Value, ref ev);
-            // Remove this effect only when we have full arm
-            RaiseLocalEvent(partEnt.Comp.Body.Value, new MoodRemoveEffectEvent("SurgeryNoHand"));
-        }
-
-        if (partEnt.Comp.PartType == BodyPartType.Torso)
-        {
-            RaiseLocalEvent(partEnt.Comp.Body.Value, new MoodRemoveEffectEvent("SurgeryNoTorso"));
-        }
-    }
-
-    private void DisablePart(Entity<BodyPartComponent> partEnt)
-    {
-        if (!TryComp(partEnt.Comp.Body, out BodyComponent? body))
-            return;
-
-        if (partEnt.Comp.PartType == BodyPartType.Leg)
-        {
-            RemoveLeg(partEnt, (partEnt.Comp.Body.Value, body));
-            RaiseLocalEvent(partEnt.Comp.Body.Value, new MoodEffectEvent("SurgeryNoLeg"));
-        }
-
-        if (partEnt.Comp.PartType == BodyPartType.Arm)
-        {
-            var hand = GetBodyChildrenOfType(partEnt.Comp.Body.Value, BodyPartType.Hand, symmetry: partEnt.Comp.Symmetry).FirstOrDefault();
-            if (hand != default)
-            {
-                var ev = new BodyPartDisabledEvent(hand);
-                RaiseLocalEvent(partEnt.Comp.Body.Value, ref ev);
-                RaiseLocalEvent(partEnt.Comp.Body.Value, new MoodEffectEvent("SurgeryNoHand"));
-            }
-        }
-
-        if (partEnt.Comp.PartType == BodyPartType.Hand)
-        {
-            var ev = new BodyPartDisabledEvent(partEnt);
-            RaiseLocalEvent(partEnt.Comp.Body.Value, ref ev);
-            RaiseLocalEvent(partEnt.Comp.Body.Value, new MoodEffectEvent("SurgeryNoHand"));
-        }
-
-        if (partEnt.Comp.PartType == BodyPartType.Torso)
-        {
-            RaiseLocalEvent(partEnt.Comp.Body.Value, new MoodEffectEvent("SurgeryNoTorso"));
-        }
-    }
-    // end-_CorvaxNext: surgery
-
     /// <summary>
     /// Tries to get the parent body part to this if applicable.
     /// Doesn't validate if it's a part of body system.
@@ -636,20 +401,6 @@ public bool AttachPartToRoot(
             && Containers.Insert(partId, body.RootContainer);
     }
 
-    // start-_CorvaxNext: surgery
-    /// <summary>
-    ///     Returns true if this parentId supports attaching a new part to the specified slot.
-    /// </summary>
-    public bool CanAttachToSlot(
-        EntityUid parentId,
-        string slotId,
-        BodyPartComponent? parentPart = null)
-    {
-        return Resolve(parentId, ref parentPart, logMissing: false)
-               && parentPart.Children.ContainsKey(slotId);
-    }
-    // end-_CorvaxNext: surgery
-
     #endregion
 
     #region Attach/Detach
@@ -687,22 +438,12 @@ public bool AttachPart(
             return false;
         }
 
-
         if (!Containers.TryGetContainer(parentPartId, GetPartSlotContainerId(slot.Id), out var container))
         {
             DebugTools.Assert($"Unable to find body slot {slot.Id} for {ToPrettyString(parentPartId)}");
             return false;
         }
 
-        // start-_CorvaxNext: surgery
-        part.ParentSlot = slot;
-
-        if (TryComp(part.Body, out HumanoidAppearanceComponent? bodyAppearance)
-            && !HasComp<BodyPartAppearanceComponent>(partId)
-            && !TerminatingOrDeleted(parentPartId)
-            && !TerminatingOrDeleted(partId)) // Saw some exceptions involving these due to the spawn menu.
-            EnsureComp<BodyPartAppearanceComponent>(partId);
-        // end-_CorvaxNext: surgery
         return Containers.Insert(partId, container);
     }
 
@@ -915,12 +656,11 @@ public bool BodyHasChild(
     public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyChildrenOfType(
         EntityUid bodyId,
         BodyPartType type,
-        BodyComponent? body = null,
-        BodyPartSymmetry? symmetry = null)
+        BodyComponent? body = null)
     {
         foreach (var part in GetBodyChildren(bodyId, body))
         {
-            if (part.Component.PartType == type && (symmetry == null || part.Component.Symmetry == symmetry)) // CorvaxNext: surgery
+            if (part.Component.PartType == type)
                 yield return part;
         }
     }
@@ -982,107 +722,6 @@ public bool TryGetBodyPartOrganComponents<T>(
         return false;
     }
 
-    // start-_CorvaxNext: surgery
-    /// <summary>
-    ///     Tries to get a list of ValueTuples of EntityUid and OrganComponent on each organ
-    ///     in the given part.
-    /// </summary>
-    /// <param name="uid">The part entity id to check on.</param>
-    /// <param name="type">The type of component to check for.</param>
-    /// <param name="part">The part to check for organs on.</param>
-    /// <returns>Whether any were found.</returns>
-    /// <remarks>
-    ///     This method is somewhat of a copout to the fact that we can't use reflection to generically
-    ///     get the type of a component on runtime due to sandboxing. So we simply do a HasComp check for each organ.
-    /// </remarks>
-    public bool TryGetBodyPartOrgans(
-        EntityUid uid,
-        Type type,
-        [NotNullWhen(true)] out List<(EntityUid Id, OrganComponent Organ)>? organs,
-        BodyPartComponent? part = null)
-    {
-        if (!Resolve(uid, ref part))
-        {
-            organs = null;
-            return false;
-        }
-
-        var list = new List<(EntityUid Id, OrganComponent Organ)>();
-
-        foreach (var organ in GetPartOrgans(uid, part))
-        {
-            if (HasComp(organ.Id, type))
-                list.Add((organ.Id, organ.Component));
-        }
-
-        if (list.Count != 0)
-        {
-            organs = list;
-            return true;
-        }
-
-        organs = null;
-        return false;
-    }
-
-    private bool TryGetPartSlotContainerName(BodyPartType partType, out HashSet<string> containerNames)
-    {
-        containerNames = partType switch
-        {
-            BodyPartType.Hand => new() { "gloves" },
-            BodyPartType.Foot => new() { "shoes" },
-            BodyPartType.Head => new() { "eyes", "ears", "head", "mask" },
-            _ => new()
-        };
-        return containerNames.Count > 0;
-    }
-
-    private bool TryGetPartFromSlotContainer(string slot, out BodyPartType? partType)
-    {
-        partType = slot switch
-        {
-            "gloves" => BodyPartType.Hand,
-            "shoes" => BodyPartType.Foot,
-            "eyes" or "ears" or "head" or "mask" => BodyPartType.Head,
-            _ => null
-        };
-        return partType is not null;
-    }
-
-    public int GetBodyPartCount(EntityUid bodyId, BodyPartType partType, BodyComponent? body = null)
-    {
-        if (!Resolve(bodyId, ref body, logMissing: false))
-            return 0;
-
-        int count = 0;
-        foreach (var part in GetBodyChildren(bodyId, body))
-        {
-            if (part.Component.PartType == partType)
-                count++;
-        }
-        return count;
-    }
-
-    public string GetSlotFromBodyPart(BodyPartComponent? part)
-    {
-        var slotName = "";
-
-        if (part is null)
-            return slotName;
-
-        if (part.SlotId != "")
-            slotName = part.SlotId;
-        else
-            slotName = part.PartType.ToString().ToLower();
-
-        if (part.Symmetry != BodyPartSymmetry.None)
-            return $"{part.Symmetry.ToString().ToLower()} {slotName}";
-        else
-            return slotName;
-    }
-
-    // end-_CorvaxNext: surgery Change End
-
     /// <summary>
     /// Gets the parent body part and all immediate child body parts for the partId.
     /// </summary>
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.cs b/Content.Shared/Body/Systems/SharedBodySystem.cs
index 55271657d9e..a45966fcc37 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Body.Part; // CorvaxNext Change
 using Content.Shared.Damage;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Standing;
@@ -29,7 +28,7 @@ public abstract partial class SharedBodySystem : EntitySystem
     /// </summary>
     public const string OrganSlotContainerIdPrefix = "body_organ_slot_";
 
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private   readonly IGameTiming _timing = default!;
     [Dependency] protected readonly IPrototypeManager Prototypes = default!;
     [Dependency] protected readonly DamageableSystem Damageable = default!;
     [Dependency] protected readonly MovementSpeedModifierSystem Movement = default!;
@@ -43,10 +42,6 @@ public override void Initialize()
 
         InitializeBody();
         InitializeParts();
-        InitializeBkm(); // CorvaxNext: surgery
-        InitializeOrgans(); // CorvaxNext: surgery
-        // To try and mitigate the server load due to integrity checks, we set up a Job Queue.
-        InitializePartAppearances();
     }
 
     /// <summary>
diff --git a/Content.Shared/Corvax/CCCVars/CCCVars.cs b/Content.Shared/Corvax/CCCVars/CCCVars.cs
index fdbce0cd984..6a9ab3b0840 100644
--- a/Content.Shared/Corvax/CCCVars/CCCVars.cs
+++ b/Content.Shared/Corvax/CCCVars/CCCVars.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.Corvax.CCCVars;
 
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index 23bd9d19e38..0e8b51137f8 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -27,7 +27,6 @@
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Audio.Systems;
-using Content.Shared._CorvaxNext.Mood;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
@@ -181,15 +180,9 @@ public void UpdateCuffState(EntityUid uid, CuffableComponent component)
             _actionBlocker.UpdateCanMove(uid);
 
             if (component.CanStillInteract)
-            {
                 _alerts.ClearAlert(uid, component.CuffedAlert);
-                RaiseLocalEvent(uid, new MoodRemoveEffectEvent("Handcuffed")); // _CorvaxNext: mood
-            }
             else
-            {
                 _alerts.ShowAlert(uid, component.CuffedAlert);
-                RaiseLocalEvent(uid, new MoodEffectEvent("Handcuffed")); // _CorvaxNext: mood
-            }
 
             var ev = new CuffedStateChangeEvent();
             RaiseLocalEvent(uid, ref ev);
diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
index 8938c748756..cc3b3f6d5d9 100644
--- a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
@@ -1,8 +1,6 @@
 using Content.Shared.Administration.Logs;
-using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Damage.Components;
 using Content.Shared.Database;
-using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
@@ -60,23 +58,8 @@ private void OnHandInteract(Entity<DamageOnInteractComponent> entity, ref Intera
                 totalDamage = DamageSpecifier.ApplyModifierSet(totalDamage, protectiveEntity.Comp.DamageProtection);
             }
         }
-        // start-_CorvaxNext: surgery
 
-        TargetBodyPart? targetPart = null;
-        var hands = CompOrNull<HandsComponent>(args.User);
-        if (hands is { ActiveHand: not null })
-        {
-            targetPart = hands.ActiveHand.Location switch
-            {
-                HandLocation.Left => TargetBodyPart.LeftArm,
-                HandLocation.Right => TargetBodyPart.RightArm,
-                _ => null
-            };
-        }
-
-        // end-_CorvaxNext: surgery
-
-        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage,  origin: args.Target, targetPart: targetPart);
+        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage,  origin: args.Target);
 
         if (totalDamage != null && totalDamage.AnyPositive())
         {
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index 646558d06b9..3c3e1b736df 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -5,14 +5,11 @@
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Body.Systems;
 using Content.Shared.Radiation.Events;
 using Content.Shared.Rejuvenate;
-using Content.Shared._CorvaxNext.Targeting;
 using Robust.Shared.GameStates;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Damage
@@ -23,7 +20,6 @@ public sealed class DamageableSystem : EntitySystem
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly INetManager _netMan = default!;
         [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
-        [Dependency] private readonly SharedBodySystem _body = default!;
 
         private EntityQuery<AppearanceComponent> _appearanceQuery;
         private EntityQuery<DamageableComponent> _damageableQuery;
@@ -101,8 +97,7 @@ public void SetDamage(EntityUid uid, DamageableComponent damageable, DamageSpeci
         ///     The damage changed event is used by other systems, such as damage thresholds.
         /// </remarks>
         public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSpecifier? damageDelta = null,
-            bool interruptsDoAfters = true, EntityUid? origin = null, bool? canSever = null)
-
+            bool interruptsDoAfters = true, EntityUid? origin = null)
         {
             component.Damage.GetDamagePerGroup(_prototypeManager, component.DamagePerGroup);
             component.TotalDamage = component.Damage.GetTotal();
@@ -113,7 +108,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 var data = new DamageVisualizerGroupData(component.DamagePerGroup.Keys.ToList());
                 _appearance.SetData(uid, DamageVisualizerKeys.DamageUpdateGroups, data, appearance);
             }
-            RaiseLocalEvent(uid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters, origin, canSever ?? true));
+            RaiseLocalEvent(uid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters, origin));
         }
 
         /// <summary>
@@ -129,8 +124,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
         ///     null if the user had no applicable components that can take damage.
         /// </returns>
         public DamageSpecifier? TryChangeDamage(EntityUid? uid, DamageSpecifier damage, bool ignoreResistances = false,
-            bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null,
-            bool? canSever = true, bool? canEvade = false, float? partMultiplier = 1.00f, TargetBodyPart? targetPart = null)
+            bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null)
         {
             if (!uid.HasValue || !_damageableQuery.Resolve(uid.Value, ref damageable, false))
             {
@@ -143,21 +137,12 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 return damage;
             }
 
-            var before = new BeforeDamageChangedEvent(damage, origin, targetPart); // CorvaxNext: surgery Change
+            var before = new BeforeDamageChangedEvent(damage, origin);
             RaiseLocalEvent(uid.Value, ref before);
 
             if (before.Cancelled)
                 return null;
 
-            // start-_CorvaxNext: surgery Change Start
-            var partDamage = new TryChangePartDamageEvent(damage, origin, targetPart, canSever ?? true, canEvade ?? false, partMultiplier ?? 1.00f);
-            RaiseLocalEvent(uid.Value, ref partDamage);
-
-            if (partDamage.Evaded || partDamage.Cancelled)
-                return null;
-
-            // end-_CorvaxNext: surgery Change End
-
             // Apply resistances
             if (!ignoreResistances)
             {
@@ -166,10 +151,10 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 {
                     // TODO DAMAGE PERFORMANCE
                     // use a local private field instead of creating a new dictionary here..
-                    // TODO: We need to add a check to see if the given armor covers the targeted part (if any) to modify or not.
                     damage = DamageSpecifier.ApplyModifierSet(damage, modifierSet);
                 }
-                var ev = new DamageModifyEvent(damage, origin, targetPart);
+
+                var ev = new DamageModifyEvent(damage, origin);
                 RaiseLocalEvent(uid.Value, ev);
                 damage = ev.Damage;
 
@@ -201,7 +186,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
             }
 
             if (delta.DamageDict.Count > 0)
-                DamageChanged(uid.Value, damageable, delta, interruptsDoAfters, origin, canSever);
+                DamageChanged(uid.Value, damageable, delta, interruptsDoAfters, origin);
 
             return delta;
         }
@@ -228,19 +213,6 @@ public void SetAllDamage(EntityUid uid, DamageableComponent component, FixedPoin
             // Setting damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an
             // empty damage delta.
             DamageChanged(uid, component, new DamageSpecifier());
-
-            // start-_CorvaxNext: surgery Change Start
-            if (HasComp<TargetingComponent>(uid))
-            {
-                foreach (var (part, _) in _body.GetBodyChildren(uid))
-                {
-                    if (!TryComp(part, out DamageableComponent? damageComp))
-                        continue;
-
-                    SetAllDamage(part, damageComp, newValue);
-                }
-            }
-            // end-_CorvaxNext: surgery Change End
         }
 
         public void SetDamageModifierSetId(EntityUid uid, string damageModifierSetId, DamageableComponent? comp = null)
@@ -314,25 +286,7 @@ private void DamageableHandleState(EntityUid uid, DamageableComponent component,
     ///     Raised before damage is done, so stuff can cancel it if necessary.
     /// </summary>
     [ByRefEvent]
-    public record struct BeforeDamageChangedEvent(
-        DamageSpecifier Damage,
-        EntityUid? Origin = null,
-        TargetBodyPart? TargetPart = null, // CorvaxNext: surgery Change
-        bool Cancelled = false);
-
-    /// <summary>
-    ///     CorvaxNext: surgery _CorvaxNext Change: Raised on parts before damage is done so we can cancel the damage if they evade.
-    /// </summary>
-    [ByRefEvent]
-    public record struct TryChangePartDamageEvent(
-        DamageSpecifier Damage,
-        EntityUid? Origin = null,
-        TargetBodyPart? TargetPart = null,
-        bool CanSever = true,
-        bool CanEvade = false,
-        float PartMultiplier = 1.00f,
-        bool Evaded = false,
-        bool Cancelled = false);
+    public record struct BeforeDamageChangedEvent(DamageSpecifier Damage, EntityUid? Origin = null, bool Cancelled = false);
 
     /// <summary>
     ///     Raised on an entity when damage is about to be dealt,
@@ -345,17 +299,16 @@ public sealed class DamageModifyEvent : EntityEventArgs, IInventoryRelayEvent
     {
         // Whenever locational damage is a thing, this should just check only that bit of armour.
         public SlotFlags TargetSlots { get; } = ~SlotFlags.POCKET;
+
         public readonly DamageSpecifier OriginalDamage;
         public DamageSpecifier Damage;
         public EntityUid? Origin;
-        public readonly TargetBodyPart? TargetPart;
 
-        public DamageModifyEvent(DamageSpecifier damage, EntityUid? origin = null, TargetBodyPart? targetPart = null)
+        public DamageModifyEvent(DamageSpecifier damage, EntityUid? origin = null)
         {
             OriginalDamage = damage;
             Damage = damage;
             Origin = origin;
-            TargetPart = targetPart;
         }
     }
 
@@ -394,17 +347,11 @@ public sealed class DamageChangedEvent : EntityEventArgs
         /// </summary>
         public readonly EntityUid? Origin;
 
-        /// <summary>
-        ///     Can this damage event sever parts?
-        /// </summary>
-        public readonly bool CanSever;
-
-        public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damageDelta, bool interruptsDoAfters, EntityUid? origin, bool canSever = true)
+        public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damageDelta, bool interruptsDoAfters, EntityUid? origin)
         {
             Damageable = damageable;
             DamageDelta = damageDelta;
             Origin = origin;
-            CanSever = canSever;
 
             if (DamageDelta == null)
                 return;
diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
index 88d4e9ddc63..20e29ef4341 100644
--- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Rejuvenate;
 using Content.Shared.Slippery;
 using Content.Shared.StatusEffect;
-using Content.Shared.Body.Systems; // CorvaxNext Change
 
 namespace Content.Shared.Damage.Systems;
 
@@ -10,8 +9,6 @@ public abstract class SharedGodmodeSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageable = default!;
 
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!; // CorvaxNext Change
-
     public override void Initialize()
     {
         base.Initialize();
@@ -53,9 +50,6 @@ public virtual void EnableGodmode(EntityUid uid, GodmodeComponent? godmode = nul
 
         // Rejuv to cover other stuff
         RaiseLocalEvent(uid, new RejuvenateEvent());
-
-        foreach (var (id, _) in _bodySystem.GetBodyChildren(uid)) // CorvaxNext Change
-            EnableGodmode(id);
     }
 
     public virtual void DisableGodmode(EntityUid uid, GodmodeComponent? godmode = null)
@@ -69,9 +63,6 @@ public virtual void DisableGodmode(EntityUid uid, GodmodeComponent? godmode = nu
         }
 
         RemComp<GodmodeComponent>(uid);
-
-        foreach (var (id, _) in _bodySystem.GetBodyChildren(uid)) // CorvaxNext Change
-            DisableGodmode(id);
     }
 
     /// <summary>
diff --git a/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs b/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs
index c594c5e1c40..24eed3adcf5 100644
--- a/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs
@@ -87,19 +87,6 @@ public void SetMinDamage(Entity<BlindableComponent?> blindable, int amount)
         blindable.Comp.MinDamage = amount;
         UpdateEyeDamage(blindable, false);
     }
-
-    // CorvaxNext Change Start
-    public void TransferBlindness(BlindableComponent newSight, BlindableComponent oldSight, EntityUid newEntity)
-    {
-        newSight.IsBlind = oldSight.IsBlind;
-        newSight.EyeDamage = oldSight.EyeDamage;
-        newSight.LightSetup = oldSight.LightSetup;
-        newSight.GraceFrame = oldSight.GraceFrame;
-        newSight.MinDamage = oldSight.MinDamage;
-        newSight.MaxDamage = oldSight.MaxDamage;
-        UpdateEyeDamage((newEntity, newSight), true);
-    }
-    // CorvaxNext Change End
 }
 
 /// <summary>
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index 3147606a71d..b3cb51ae359 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -30,7 +30,6 @@ public sealed partial class HandsComponent : Component
     /// <summary>
     ///     List of hand-names. These are keys for <see cref="Hands"/>. The order of this list determines the order in which hands are iterated over.
     /// </summary>
-    [ViewVariables]
     public List<string> SortedHands = new();
 
     /// <summary>
diff --git a/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs b/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs
deleted file mode 100644
index ccccf2f1113..00000000000
--- a/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Content.Shared.Humanoid.Events;
-
-// start-_CorvaxNext: surgery
-/// <summary>
-///     Raised on an entity when their profile has finished being loaded
-/// </summary>
-public sealed class ProfileLoadFinishedEvent : EntityEventArgs { }
-// end-_CorvaxNext: surgery
diff --git a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
index 3a88b1814a2..0f8b940bd66 100644
--- a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
+++ b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
@@ -47,30 +47,18 @@ public static IEnumerable<HumanoidVisualLayers> Sublayers(HumanoidVisualLayers l
                     yield return HumanoidVisualLayers.LArm;
                     yield return HumanoidVisualLayers.LHand;
                     break;
-                case HumanoidVisualLayers.LHand: // CorvaxNext: surgery
-                    yield return HumanoidVisualLayers.LHand;
-                    break;
                 case HumanoidVisualLayers.RArm:
                     yield return HumanoidVisualLayers.RArm;
                     yield return HumanoidVisualLayers.RHand;
                     break;
-                case HumanoidVisualLayers.RHand: // CorvaxNext: surgery
-                    yield return HumanoidVisualLayers.RHand;
-                    break;
                 case HumanoidVisualLayers.LLeg:
                     yield return HumanoidVisualLayers.LLeg;
                     yield return HumanoidVisualLayers.LFoot;
                     break;
-                case HumanoidVisualLayers.LFoot: // CorvaxNext: surgery
-                    yield return HumanoidVisualLayers.LFoot;
-                    break;
                 case HumanoidVisualLayers.RLeg:
                     yield return HumanoidVisualLayers.RLeg;
                     yield return HumanoidVisualLayers.RFoot;
                     break;
-                case HumanoidVisualLayers.RFoot: // CorvaxNext: surgery
-                    yield return HumanoidVisualLayers.RFoot;
-                    break;
                 case HumanoidVisualLayers.Chest:
                     yield return HumanoidVisualLayers.Chest;
                     yield return HumanoidVisualLayers.Tail;
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 3df780c177b..4f011cba982 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using System.Numerics;
 using Content.Corvax.Interfaces.Shared;
 using Content.Shared.CCVar;
 using Content.Shared.Decals;
@@ -8,7 +7,6 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Corvax.TTS;
-using Content.Shared.Humanoid.Events;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Preferences;
 using Robust.Shared;
@@ -403,7 +401,7 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profile
         }
 
         humanoid.Age = profile.Age;
-        
+
         Dirty(uid, humanoid);
     }
 
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index fe11bba2558..7281fdb285e 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -57,20 +57,10 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ToggleFullscreen = "ToggleFullscreen";
         public static readonly BoundKeyFunction Point = "Point";
         public static readonly BoundKeyFunction OfferItem = "OfferItem"; // Corvax-Next-Offer
-        public static readonly BoundKeyFunction ToggleStanding = "ToggleStanding"; // CorvaxNext: Laying System standing
+        public static readonly BoundKeyFunction ToggleStanding = "ToggleStanding"; // _CorvaxNext: Laying System standing
         public static readonly BoundKeyFunction ZoomOut = "ZoomOut";
         public static readonly BoundKeyFunction ZoomIn = "ZoomIn";
         public static readonly BoundKeyFunction ResetZoom = "ResetZoom";
-        public static readonly BoundKeyFunction TargetHead = "TargetHead"; // CorvaxNext: surgery
-        public static readonly BoundKeyFunction TargetTorso = "TargetTorso"; // CorvaxNext: surgery
-        public static readonly BoundKeyFunction TargetLeftArm = "TargetLeftArm"; // CorvaxNext: surgery
-        public static readonly BoundKeyFunction TargetLeftHand = "TargetLeftHand"; // CorvaxNext: surgery
-        public static readonly BoundKeyFunction TargetRightArm = "TargetRightArm"; // CorvaxNext: surgery
-        public static readonly BoundKeyFunction TargetRightHand = "TargetRightHand"; // CorvaxNext: surgery
-        public static readonly BoundKeyFunction TargetLeftLeg = "TargetLeftLeg"; // CorvaxNext: surgery
-        public static readonly BoundKeyFunction TargetLeftFoot = "TargetLeftFoot"; // CorvaxNext: surgery
-        public static readonly BoundKeyFunction TargetRightLeg = "TargetRightLeg"; // CorvaxNext: surgery
-        public static readonly BoundKeyFunction TargetRightFoot = "TargetRightFoot"; // CorvaxNext: surgery
 
         public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp";
         public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown";
diff --git a/Content.Shared/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs
index 324aac229f3..8df0035fc98 100644
--- a/Content.Shared/Interaction/InteractionPopupSystem.cs
+++ b/Content.Shared/Interaction/InteractionPopupSystem.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
-using Content.Shared._CorvaxNext.Mood;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
@@ -95,19 +94,7 @@ private void SharedInteract(
         if (_random.Prob(component.SuccessChance))
         {
             if (component.InteractSuccessString != null)
-            {
                 msg = Loc.GetString(component.InteractSuccessString, ("target", Identity.Entity(uid, EntityManager))); // Success message (localized).
-                if (component.InteractSuccessString == "hugging-success-generic")
-                {
-                    var hug = new MoodEffectEvent("BeingHugged"); // _CorvaxNext: mood
-                    RaiseLocalEvent(target, hug);
-                }
-                else if (component.InteractSuccessString.Contains("petting-success-"))
-                {
-                    var pet = new MoodEffectEvent("PetAnimal"); // _CorvaxNext: mood
-                    RaiseLocalEvent(user, pet);
-                }
-            }
 
             if (component.InteractSuccessSound != null)
                 sfx = component.InteractSuccessSound;
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index 6150bbaece6..61e0114ff24 100644
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -17,7 +17,6 @@ public sealed partial class InventoryComponent : Component
     [DataField("speciesId")] public string? SpeciesId { get; set; }
 
     public SlotDefinition[] Slots = Array.Empty<SlotDefinition>();
-
     public ContainerSlot[] Containers = Array.Empty<ContainerSlot>();
 
     [DataField]
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index e5a431a8135..8158b8c2f62 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -43,6 +43,7 @@ private void InitializeEquip()
         //these events ensure that the client also gets its proper events raised when getting its containerstate updated
         SubscribeLocalEvent<InventoryComponent, EntInsertedIntoContainerMessage>(OnEntInserted);
         SubscribeLocalEvent<InventoryComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
+
         SubscribeAllEvent<UseSlotNetworkMessage>(OnUseSlot);
     }
 
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 525bc9d9337..04d58c1cd52 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -2,19 +2,17 @@
 using System.Linq;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Storage;
-using Content.Shared.Random;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Inventory;
+
 public partial class InventorySystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IViewVariablesManager _vvm = default!;
-    [Dependency] private readonly RandomHelperSystem _randomHelper = default!; // CorvaxNext: surgery
-    [Dependency] private readonly ISerializationManager _serializationManager = default!; // CorvaxNext: surgery
+
     private void InitializeSlots()
     {
         SubscribeLocalEvent<InventoryComponent, ComponentInit>(OnInit);
@@ -62,8 +60,7 @@ protected virtual void OnInit(EntityUid uid, InventoryComponent component, Compo
         if (!_prototypeManager.TryIndex(component.TemplateId, out InventoryTemplatePrototype? invTemplate))
             return;
 
-        _serializationManager.CopyTo(invTemplate.Slots, ref component.Slots, notNullableOverride: true);  // CorvaxNext: surgery
-
+        component.Slots = invTemplate.Slots;
         component.Containers = new ContainerSlot[component.Slots.Length];
         for (var i = 0; i < component.Containers.Length; i++)
         {
@@ -142,7 +139,7 @@ public bool TryGetSlot(EntityUid uid, string slot, [NotNullWhen(true)] out SlotD
 
         foreach (var slotDef in inventory.Slots)
         {
-            if (!slotDef.Name.Equals(slot) || slotDef.Disabled) // CorvaxNext: surgery
+            if (!slotDef.Name.Equals(slot))
                 continue;
             slotDefinition = slotDef;
             return true;
@@ -197,37 +194,6 @@ private IEnumerable<string> ListViewVariablesSlots(EntityUid uid, InventoryCompo
         }
     }
 
-    // start-_CorvaxNext: surgery
-    public void SetSlotStatus(EntityUid uid, string slotName, bool isDisabled, InventoryComponent? inventory = null)
-    {
-        if (!Resolve(uid, ref inventory))
-            return;
-
-        foreach (var slot in inventory.Slots)
-        {
-            if (slot.Name != slotName)
-                continue;
-
-
-            if (!TryGetSlotContainer(uid, slotName, out var container, out _, inventory))
-                break;
-
-            if (isDisabled)
-            {
-                if (container.ContainedEntity is { } entityUid && TryComp(entityUid, out TransformComponent? transform) && _gameTiming.IsFirstTimePredicted)
-                {
-                    _transform.AttachToGridOrMap(entityUid, transform);
-                    _randomHelper.RandomOffset(entityUid, 0.5f);
-                }
-            }
-            //slot.Disabled = isDisabled; // CorvaxNext: TURNED OFF FEATURE, would be fixed today maybe with proper limbs cutting disables appropriate slot(-s)
-            break;
-        }
-
-        Dirty(uid, inventory);
-    }
-    // end-_CorvaxNext: surgery
-
     /// <summary>
     /// Change the inventory template ID an entity is using. The new template must be compatible.
     /// </summary>
@@ -286,7 +252,7 @@ public bool MoveNext([NotNullWhen(true)] out ContainerSlot? container)
                 var i = _nextIdx++;
                 var slot = _slots[i];
 
-                if ((slot.SlotFlags & _flags) == 0 || slot.Disabled) // CorvaxNext: surgery
+                if ((slot.SlotFlags & _flags) == 0)
                     continue;
 
                 container = _containers[i];
@@ -304,7 +270,7 @@ public bool NextItem(out EntityUid item)
                 var i = _nextIdx++;
                 var slot = _slots[i];
 
-                if ((slot.SlotFlags & _flags) == 0 || slot.Disabled) // CorvaxNext: surgery
+                if ((slot.SlotFlags & _flags) == 0)
                     continue;
 
                 var container = _containers[i];
@@ -342,31 +308,4 @@ public bool NextItem(out EntityUid item, [NotNullWhen(true)] out SlotDefinition?
             return false;
         }
     }
-
-    // Shitmed Change Start
-    public void DropSlotContents(EntityUid uid, string slotName, InventoryComponent? inventory = null)
-    {
-        if (!Resolve(uid, ref inventory))
-            return;
-
-        foreach (var slot in inventory.Slots)
-        {
-            if (slot.Name != slotName)
-                continue;
-
-            if (!TryGetSlotContainer(uid, slotName, out var container, out _, inventory))
-                break;
-
-            if (container.ContainedEntity is { } entityUid && TryComp(entityUid, out TransformComponent? transform) && _gameTiming.IsFirstTimePredicted)
-            {
-                _transform.AttachToGridOrMap(entityUid, transform);
-                _randomHelper.RandomOffset(entityUid, 0.5f);
-            }
-
-            break;
-        }
-
-        Dirty(uid, inventory);
-    }
-    // Shitmed Change End
 }
diff --git a/Content.Shared/Inventory/InventoryTemplatePrototype.cs b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
index 347b3b41072..91accec8c93 100644
--- a/Content.Shared/Inventory/InventoryTemplatePrototype.cs
+++ b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
@@ -60,11 +60,4 @@ public sealed partial class SlotDefinition
     ///     Entity blacklist for CanEquip checks.
     /// </summary>
     [DataField("blacklist")] public EntityWhitelist? Blacklist = null;
-
-    // start-_CorvaxNext: surgery
-    /// <summary>
-    ///     Is this slot disabled? Could be due to severing or other reasons.
-    /// </summary>
-    [DataField] public bool Disabled;
-    // end-_CorvaxNext: surgery
 }
diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
index f7193cf44cf..08af1a36a7b 100644
--- a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
+++ b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
@@ -1,5 +1,3 @@
-using Content.Shared._CorvaxNext.Targeting;
-using Content.Shared.Body.Components;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.MedicalScanner;
@@ -16,10 +14,8 @@ public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
     public bool? ScanMode;
     public bool? Bleeding;
     public bool? Unrevivable;
-    public Dictionary<TargetBodyPart, TargetIntegrity>? Body; // CorvaxNext: surgery
-    public NetEntity? Part; // CorvaxNext: surgery
 
-    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable, Dictionary<TargetBodyPart, TargetIntegrity>? body, NetEntity? part = null)
+    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable)
     {
         TargetEntity = targetEntity;
         Temperature = temperature;
@@ -27,17 +23,6 @@ public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperatu
         ScanMode = scanMode;
         Bleeding = bleeding;
         Unrevivable = unrevivable;
-        Body = body; // CorvaxNext: surgery
-        Part = part; // CorvaxNext: surgery
     }
 }
 
-// start-_CorvaxNext: surgery
-[Serializable, NetSerializable]
-public sealed class HealthAnalyzerPartMessage(NetEntity? owner, TargetBodyPart? bodyPart) : BoundUserInterfaceMessage
-{
-    public readonly NetEntity? Owner = owner;
-    public readonly TargetBodyPart? BodyPart = bodyPart;
-
-}
-// end-_CorvaxNext: surgery
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
index 7cf68883f0c..5928b3871ff 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
@@ -1,5 +1,4 @@
-using Content.Shared._CorvaxNext.Surgery.Body;
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.Mobs.Components;
 
 namespace Content.Shared.Mobs.Systems;
@@ -104,11 +103,6 @@ private void ChangeState(EntityUid target, MobStateComponent component, MobState
         if (oldState == newState || !component.AllowedStates.Contains(newState))
             return;
 
-        // start-_CorvaxNext: surgery
-        if (oldState == MobState.Dead && HasComp<DebrainedComponent>(target))
-            return;
-        // end-_CorvaxNext: surgery
-
         OnExitState(target, component, oldState);
         component.CurrentState = newState;
         OnEnterState(target, component, newState);
diff --git a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
index be30156d7aa..8e89e4b62b3 100644
--- a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
+++ b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
@@ -1,7 +1,5 @@
-using Content.Shared._CorvaxNext.Standing;
 using Content.Shared.Inventory;
 using Content.Shared.Movement.Components;
-using Content.Shared.Standing;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Movement.Systems
@@ -10,19 +8,6 @@ public sealed class MovementSpeedModifierSystem : EntitySystem
     {
         [Dependency] private readonly IGameTiming _timing = default!;
 
-        // start-_CorvaxNext: layingdown
-        private EntityQuery<LayingDownComponent> _layerQuery;
-        private EntityQuery<StandingStateComponent> _standingStateQuery;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            _layerQuery = GetEntityQuery<LayingDownComponent>();
-            _standingStateQuery = GetEntityQuery<StandingStateComponent>();
-        }
-        // end-_CorvaxNext: layingdows
-
         public void RefreshMovementSpeedModifiers(EntityUid uid, MovementSpeedModifierComponent? move = null)
         {
             if (!Resolve(uid, ref move, false))
@@ -34,25 +19,12 @@ public void RefreshMovementSpeedModifiers(EntityUid uid, MovementSpeedModifierCo
             var ev = new RefreshMovementSpeedModifiersEvent();
             RaiseLocalEvent(uid, ev);
 
-            // start-_CorvaxNext: layingdown
-            var walkSpeedModifier = ev.WalkSpeedModifier;
-            var sprintSpeedModifier = ev.SprintSpeedModifier;
-            // cap moving speed while laying
-            if (_standingStateQuery.TryComp(uid, out var standing) &&
-                !standing.Standing &&
-                _layerQuery.TryComp(uid, out var layingDown))
-            {
-                walkSpeedModifier = Math.Min(walkSpeedModifier, layingDown.SpeedModify);
-                sprintSpeedModifier = Math.Min(sprintSpeedModifier, layingDown.SpeedModify);
-            }
-            // end-_CorvaxNext: layingdows
-
-            if (MathHelper.CloseTo(walkSpeedModifier, move.WalkSpeedModifier) &&
-                MathHelper.CloseTo(sprintSpeedModifier, move.SprintSpeedModifier))
+            if (MathHelper.CloseTo(ev.WalkSpeedModifier, move.WalkSpeedModifier) &&
+                MathHelper.CloseTo(ev.SprintSpeedModifier, move.SprintSpeedModifier))
                 return;
 
-            move.WalkSpeedModifier = walkSpeedModifier;
-            move.SprintSpeedModifier = sprintSpeedModifier;
+            move.WalkSpeedModifier = ev.WalkSpeedModifier;
+            move.SprintSpeedModifier = ev.SprintSpeedModifier;
             Dirty(uid, move);
         }
 
diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index d66a49fb1d6..b75a1152cf6 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -6,15 +6,10 @@
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Rejuvenate;
 using Content.Shared.StatusIcon;
-using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Shared._CorvaxNext.Mood;
-using Robust.Shared.Network;
-using Robust.Shared.Configuration;
-using Content.Shared._CorvaxNext.NextVars;
 
 namespace Content.Shared.Nutrition.EntitySystems;
 
@@ -28,8 +23,6 @@ public sealed class HungerSystem : EntitySystem
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
-    [Dependency] private readonly INetManager _net = default!; // Corvax-Next-Surgery
-    [Dependency] private readonly IConfigurationManager _config = default!; // Corvax-Next-Surgery
 
     [ValidatePrototypeId<SatiationIconPrototype>]
     private const string HungerIconOverfedId = "HungerIconOverfed";
@@ -65,9 +58,10 @@ private void OnShutdown(EntityUid uid, HungerComponent component, ComponentShutd
 
     private void OnRefreshMovespeed(EntityUid uid, HungerComponent component, RefreshMovementSpeedModifiersEvent args)
     {
-        if (_config.GetCVar(NextVars.MoodEnabled) // Corvax-Next-Surgery
-            || component.CurrentThreshold > HungerThreshold.Starving // Corvax-Next-Surgery
-            || _jetpack.IsUserFlying(uid)) // Corvax-Next-Surgery
+        if (component.CurrentThreshold > HungerThreshold.Starving)
+            return;
+
+        if (_jetpack.IsUserFlying(uid))
             return;
 
         args.ModifySpeed(component.StarvingSlowdownModifier, component.StarvingSlowdownModifier);
@@ -138,9 +132,9 @@ private void UpdateCurrentThreshold(EntityUid uid, HungerComponent? component =
         var calculatedHungerThreshold = GetHungerThreshold(component);
         if (calculatedHungerThreshold == component.CurrentThreshold)
             return;
-
         component.CurrentThreshold = calculatedHungerThreshold;
         DoHungerThresholdEffects(uid, component);
+        Dirty(uid, component);
     }
 
     private void DoHungerThresholdEffects(EntityUid uid, HungerComponent? component = null, bool force = false)
@@ -153,13 +147,7 @@ private void DoHungerThresholdEffects(EntityUid uid, HungerComponent? component
 
         if (GetMovementThreshold(component.CurrentThreshold) != GetMovementThreshold(component.LastThreshold))
         {
-            if (!_config.GetCVar(NextVars.MoodEnabled)) // Corvax-Next-Surgery
-                _movementSpeedModifier.RefreshMovementSpeedModifiers(uid); // Corvax-Next-Surgery
-            else if (_net.IsServer) // Corvax-Next-Surgery
-            {
-                var ev = new MoodEffectEvent("Hunger" + component.CurrentThreshold); // Corvax-Next-Surgery
-                RaiseLocalEvent(uid, ev); // Corvax-Next-Surgery
-            }
+            _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
         }
 
         if (component.HungerThresholdAlerts.TryGetValue(component.CurrentThreshold, out var alertId))
@@ -174,7 +162,6 @@ private void DoHungerThresholdEffects(EntityUid uid, HungerComponent? component
         if (component.HungerThresholdDecayModifiers.TryGetValue(component.CurrentThreshold, out var modifier))
         {
             component.ActualDecayRate = component.BaseDecayRate * modifier;
-            SetAuthoritativeHungerValue((uid, component), GetHunger(component));
         }
 
         component.LastThreshold = component.CurrentThreshold;
@@ -213,7 +200,6 @@ public HungerThreshold GetHungerThreshold(HungerComponent component, float? food
                 value = threshold.Value;
             }
         }
-
         return result;
     }
 
@@ -281,10 +267,11 @@ public override void Update(float frameTime)
         {
             if (_timing.CurTime < hunger.NextThresholdUpdateTime)
                 continue;
-            hunger.NextThresholdUpdateTime = _timing.CurTime + hunger.ThresholdUpdateRate;
+            hunger.NextThresholdUpdateTime = _timing.CurTime + hunger.NextThresholdUpdateTime;
 
-            UpdateCurrentThreshold(uid, hunger);
+            ModifyHunger(uid, -hunger.ActualDecayRate, hunger);
             DoContinuousHungerEffects(uid, hunger);
         }
     }
 }
+
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
index 523e75c4d14..bd7251b9438 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Stunnable;
 using Content.Shared.Throwing;
-using Content.Shared._CorvaxNext.Mood;
 using JetBrains.Annotations;
 
 namespace Content.Shared.Nutrition.EntitySystems
@@ -45,11 +44,6 @@ public void SetCreamPied(EntityUid uid, CreamPiedComponent creamPied, bool value
             {
                 _appearance.SetData(uid, CreamPiedVisuals.Creamed, value, appearance);
             }
-
-            if (value)
-                RaiseLocalEvent(uid, new MoodEffectEvent("Creampied")); // _CorvaxNext: mood
-            else
-                RaiseLocalEvent(uid, new MoodRemoveEffectEvent("Creampied")); // _CorvaxNext: mood
         }
 
         private void OnCreamPieLand(EntityUid uid, CreamPieComponent component, ref LandEvent args)
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index 381e1bb1b11..2937c48d482 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -9,9 +9,6 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Shared._CorvaxNext.Mood;
-using Robust.Shared.Configuration;
-using Content.Shared._CorvaxNext.NextVars;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Shared.Nutrition.EntitySystems;
@@ -25,7 +22,6 @@ public sealed class ThirstSystem : EntitySystem
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
 
     [ValidatePrototypeId<SatiationIconPrototype>]
     private const string ThirstIconOverhydratedId = "ThirstIconOverhydrated";
@@ -67,8 +63,7 @@ private void OnMapInit(EntityUid uid, ThirstComponent component, MapInitEvent ar
     private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args)
     {
         // TODO: This should really be taken care of somewhere else
-        if (_config.GetCVar(NextVars.MoodEnabled)
-            || _jetpack.IsUserFlying(uid))
+        if (_jetpack.IsUserFlying(uid))
             return;
 
         var mod = component.CurrentThirstThreshold <= ThirstThreshold.Parched ? 0.75f : 1.0f;
@@ -153,9 +148,8 @@ public bool TryGetStatusIconPrototype(ThirstComponent component, [NotNullWhen(tr
 
     private void UpdateEffects(EntityUid uid, ThirstComponent component)
     {
-        if (!_config.GetCVar(NextVars.MoodEnabled)
-            && IsMovementThreshold(component.LastThirstThreshold) != IsMovementThreshold(component.CurrentThirstThreshold)
-            && TryComp(uid, out MovementSpeedModifierComponent? movementSlowdownComponent))
+        if (IsMovementThreshold(component.LastThirstThreshold) != IsMovementThreshold(component.CurrentThirstThreshold) &&
+                TryComp(uid, out MovementSpeedModifierComponent? movementSlowdownComponent))
         {
             _movement.RefreshMovementSpeedModifiers(uid, movementSlowdownComponent);
         }
@@ -170,9 +164,6 @@ private void UpdateEffects(EntityUid uid, ThirstComponent component)
             _alerts.ClearAlertCategory(uid, component.ThirstyCategory);
         }
 
-        var ev = new MoodEffectEvent("Thirst" + component.CurrentThirstThreshold); // _CorvaxNext: mood
-        RaiseLocalEvent(uid, ev);
-
         switch (component.CurrentThirstThreshold)
         {
             case ThirstThreshold.OverHydrated:
diff --git a/Content.Shared/Overlays/ShowHealthBarsComponent.cs b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
index 8d847b72d7a..3f27885db18 100644
--- a/Content.Shared/Overlays/ShowHealthBarsComponent.cs
+++ b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
@@ -8,13 +8,15 @@ namespace Content.Shared.Overlays;
 /// <summary>
 /// This component allows you to see health bars above damageable mobs.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState(true)]
 public sealed partial class ShowHealthBarsComponent : Component
 {
     /// <summary>
     /// Displays health bars of the damage containers.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField]
+    [AutoNetworkedField]
     public List<ProtoId<DamageContainerPrototype>> DamageContainers = new()
     {
         "Biological"
diff --git a/Content.Shared/Overlays/ShowHealthIconsComponent.cs b/Content.Shared/Overlays/ShowHealthIconsComponent.cs
index 08f86e6ccf9..bc8b5419d2a 100644
--- a/Content.Shared/Overlays/ShowHealthIconsComponent.cs
+++ b/Content.Shared/Overlays/ShowHealthIconsComponent.cs
@@ -7,14 +7,15 @@ namespace Content.Shared.Overlays;
 /// <summary>
 /// This component allows you to see health status icons above damageable mobs.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState(true)]
 public sealed partial class ShowHealthIconsComponent : Component
 {
     /// <summary>
     /// Displays health status icons of the damage containers.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField]
+    [AutoNetworkedField]
     public List<ProtoId<DamageContainerPrototype>> DamageContainers = new()
     {
         "Biological"
diff --git a/Content.Shared/Prying/Components/PryingComponent.cs b/Content.Shared/Prying/Components/PryingComponent.cs
index 0776ae9fd54..93713e52c67 100644
--- a/Content.Shared/Prying/Components/PryingComponent.cs
+++ b/Content.Shared/Prying/Components/PryingComponent.cs
@@ -3,13 +3,13 @@
 
 namespace Content.Shared.Prying.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] // CorvaxNext Change
+[RegisterComponent, NetworkedComponent]
 public sealed partial class PryingComponent : Component
 {
     /// <summary>
     /// Whether the entity can pry open powered doors
     /// </summary>
-    [DataField, AutoNetworkedField] // CorvaxNext Change
+    [DataField]
     public bool PryPowered;
 
     /// <summary>
@@ -22,7 +22,7 @@ public sealed partial class PryingComponent : Component
     /// Modifier on the prying time.
     /// Lower values result in more time.
     /// </summary>
-    [DataField, AutoNetworkedField] // CorvaxNext Change
+    [DataField]
     public float SpeedModifier = 1.0f;
 
     /// <summary>
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
index a0ea3dc02ff..19cc19aa19c 100644
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -9,7 +9,6 @@
 using Content.Shared.StepTrigger.Systems;
 using Content.Shared.Stunnable;
 using Content.Shared.Throwing;
-using Content.Shared._CorvaxNext.Mood;
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -20,7 +19,7 @@
 
 namespace Content.Shared.Slippery;
 
-[UsedImplicitly]
+[UsedImplicitly] 
 public sealed class SlipperySystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
@@ -84,7 +83,7 @@ private void OnEntityExit(EntityUid uid, SlipperyComponent component, ref EndCol
     {
         if (HasComp<SpeedModifiedByContactComponent>(args.OtherEntity))
             _speedModifier.AddModifiedEntity(args.OtherEntity);
-    }
+    } 
 
     private bool CanSlip(EntityUid uid, EntityUid toSlip)
     {
@@ -129,8 +128,6 @@ public void TrySlip(EntityUid uid, SlipperyComponent component, EntityUid other,
 
         _stun.TryParalyze(other, TimeSpan.FromSeconds(component.ParalyzeTime), true);
 
-        RaiseLocalEvent(other, new MoodEffectEvent("MobSlipped")); // _CorvaxNext: mood
-
         // Preventing from playing the slip sound when you are already knocked down.
         if (playSound)
         {
diff --git a/Content.Shared/Smoking/Components/MatchstickComponent.cs b/Content.Shared/Smoking/Components/MatchstickComponent.cs
deleted file mode 100644
index 51a93d13636..00000000000
--- a/Content.Shared/Smoking/Components/MatchstickComponent.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// CorvaxNext Change Start
-
-using Content.Shared.Smoking.Systems;
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Smoking.Components;
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedMatchstickSystem))]
-[AutoGenerateComponentState]
-public sealed partial class MatchstickComponent : Component
-{
-    /// <summary>
-    /// Current state to matchstick. Can be <code>Unlit</code>, <code>Lit</code> or <code>Burnt</code>.
-    /// </summary>
-    [DataField("state"), AutoNetworkedField]
-    public SmokableState CurrentState = SmokableState.Unlit;
-
-    /// <summary>
-    /// How long will matchstick last in seconds.
-    /// </summary>
-    [DataField]
-    public int Duration = 10;
-
-    /// <summary>
-    /// Sound played when you ignite the matchstick.
-    /// </summary>
-    [DataField(required: true)]
-    public SoundSpecifier IgniteSound = default!;
-}
-
-// CorvaxNext Change End
diff --git a/Content.Shared/Smoking/Systems/SharedMatchstickSystem.cs b/Content.Shared/Smoking/Systems/SharedMatchstickSystem.cs
deleted file mode 100644
index 4573df8fbbd..00000000000
--- a/Content.Shared/Smoking/Systems/SharedMatchstickSystem.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// CorvaxNext Change Start
-using Content.Shared.Smoking.Components;
-
-namespace Content.Shared.Smoking.Systems;
-
-public abstract class SharedMatchstickSystem : EntitySystem
-{
-    public virtual bool SetState(Entity<MatchstickComponent> ent, SmokableState state)
-    {
-        if (ent.Comp.CurrentState == state)
-            return false;
-
-        ent.Comp.CurrentState = state;
-        Dirty(ent);
-        return true;
-    }
-}
-// CorvaxNext Change End
diff --git a/Content.Shared/Standing/StandingStateComponent.cs b/Content.Shared/Standing/StandingStateComponent.cs
index a2ed185a6a3..8770b79269e 100644
--- a/Content.Shared/Standing/StandingStateComponent.cs
+++ b/Content.Shared/Standing/StandingStateComponent.cs
@@ -10,10 +10,10 @@ public sealed partial class StandingStateComponent : Component
     [DataField]
     public SoundSpecifier DownSound { get; private set; } = new SoundCollectionSpecifier("BodyFall");
 
-    // CorvaxNext EDIT START
+    // _CorvaxNext EDIT START
     [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
     public StandingState CurrentState { get; set; } = StandingState.Standing;
-    // CorvaxNext EDIT END
+    // _CorvaxNext EDIT END
 
     public bool Standing
     {
@@ -28,11 +28,11 @@ public bool Standing
     [DataField, AutoNetworkedField]
     public List<string> ChangedFixtures = new();
 }
-// CorvaxNext EDIT START
+// _CorvaxNext EDIT START
 public enum StandingState
 {
     Lying,
     GettingUp,
     Standing,
 }
-// CorvaxNext EDIT END
+// _CorvaxNext EDIT END
diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs
index 19191925ca1..d50ee64f2e2 100644
--- a/Content.Shared/Standing/StandingStateSystem.cs
+++ b/Content.Shared/Standing/StandingStateSystem.cs
@@ -15,7 +15,7 @@ public sealed class StandingStateSystem : EntitySystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; // CorvaxNext EDIT
+    [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; // _CorvaxNext EDIT
 
     // If StandingCollisionLayer value is ever changed to more than one layer, the logic needs to be edited.
     private const int StandingCollisionLayer = (int)CollisionGroup.MidImpassable;
@@ -97,7 +97,7 @@ public bool Down(EntityUid uid,
             _audio.PlayPredicted(standingState.DownSound, uid, null);
         }
 
-        _movement.RefreshMovementSpeedModifiers(uid); // CorvaxNext EDIT
+        _movement.RefreshMovementSpeedModifiers(uid); // _CorvaxNext EDIT
         return true;
     }
 
@@ -143,7 +143,7 @@ public bool Stand(EntityUid uid,
             }
         }
         standingState.ChangedFixtures.Clear();
-        _movement.RefreshMovementSpeedModifiers(uid); // CorvaxNext EDIT
+        _movement.RefreshMovementSpeedModifiers(uid); // _CorvaxNext EDIT
 
         return true;
     }
diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
index bb83bd3caee..95abea63db0 100644
--- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
@@ -44,7 +44,7 @@ public override void Update(float frameTime)
                     continue;
                 }
 
-                foreach (var state in status.ActiveEffects.ToArray())
+                foreach (var state in status.ActiveEffects)
                 {
                     if (curTime > state.Value.Cooldown.Item2)
                         TryRemoveStatusEffect(uid, state.Key, status);
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index c7d1a129f48..212c03475cf 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -72,7 +72,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public bool ResistanceBypass = false;
-
+    
     /// <summary>
     /// Base damage for this weapon. Can be modified via heavy damage or other means.
     /// </summary>
@@ -90,14 +90,6 @@ public sealed partial class MeleeWeaponComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField]
     public FixedPoint2 ClickDamageModifier = FixedPoint2.New(1);
 
-    // start-_CorvaxNext: surgery
-    /// <summary>
-    ///     Part damage is multiplied by this amount for single-target attacks
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float ClickPartDamageMultiplier = 1.00f;
-    // end-_CorvaxNext: surgery
-
     // TODO: Temporarily 1.5 until interactionoutline is adjusted to use melee, then probably drop to 1.2
     /// <summary>
     /// Nearest edge range to hit an entity.
@@ -105,26 +97,6 @@ public sealed partial class MeleeWeaponComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public float Range = 1.5f;
 
-    // start-_CorvaxNext: surgery
-    /// <summary>
-    ///     Attack range for heavy swings
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float HeavyRangeModifier = 1f;
-
-    /// <summary>
-    ///     Weapon damage is multiplied by this amount for heavy swings
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float HeavyDamageBaseModifier = 1.2f;
-
-    /// <summary>
-    ///     Part damage is multiplied by this amount for heavy swings
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float HeavyPartDamageMultiplier = 0.5f;
-    // end-_CorvaxNext: surgery
-
     /// <summary>
     /// Total width of the angle for wide attacks.
     /// </summary>
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index fd6c5215c60..767b5c4ef62 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -511,7 +511,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         RaiseLocalEvent(target.Value, attackedEvent);
 
         var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
-        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin: user, ignoreResistances:resistanceBypass, partMultiplier: component.ClickPartDamageMultiplier);
+        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user, ignoreResistances:resistanceBypass);
 
         if (damageResult is {Empty: false})
         {
@@ -666,7 +666,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
             RaiseLocalEvent(entity, attackedEvent);
             var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
 
-            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, partMultiplier: component.HeavyPartDamageMultiplier);
+            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin:user);
 
             if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero)
             {
diff --git a/Content.Shared/_CorvaxNext/Alert/Click/AcceptingOffer.cs b/Content.Shared/_CorvaxNext/Alert/Click/AcceptingOffer.cs
index cc8f3e77b80..0b7be4ccb08 100644
--- a/Content.Shared/_CorvaxNext/Alert/Click/AcceptingOffer.cs
+++ b/Content.Shared/_CorvaxNext/Alert/Click/AcceptingOffer.cs
@@ -6,8 +6,3 @@ namespace Content.Shared._CorvaxNext.Alert.Click;
 /// Accepting the offer and receive item
 /// </summary>
 public sealed partial class AcceptOfferAlertEvent : BaseAlertEvent;
-
-/// <summary>
-/// Raised while clicking th mood alert to see it's current modifiers.
-/// </summary>
-public sealed partial class MoodCheckAlertEvent : BaseAlertEvent;
diff --git a/Content.Shared/_CorvaxNext/Mood/MoodCategoryPrototype.cs b/Content.Shared/_CorvaxNext/Mood/MoodCategoryPrototype.cs
deleted file mode 100644
index b6e34afe9d4..00000000000
--- a/Content.Shared/_CorvaxNext/Mood/MoodCategoryPrototype.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Mood;
-
-/// <summary>
-///     A prototype defining a category for moodlets, where only a single moodlet of a given category is permitted.
-/// </summary>
-[Prototype]
-public sealed class MoodCategoryPrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; } = default!;
-}
diff --git a/Content.Shared/_CorvaxNext/Mood/MoodEffectPrototype.cs b/Content.Shared/_CorvaxNext/Mood/MoodEffectPrototype.cs
deleted file mode 100644
index 9f3a6b15f80..00000000000
--- a/Content.Shared/_CorvaxNext/Mood/MoodEffectPrototype.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Mood;
-
-[Prototype]
-public sealed class MoodEffectPrototype : IPrototype
-{
-    /// <summary>
-    ///     The ID of the moodlet to use.
-    /// </summary>
-    [IdDataField]
-    public string ID { get; } = default!;
-
-    public string Description => Loc.GetString($"mood-effect-{ID}");
-    /// <summary>
-    ///     If they already have an effect with the same category, the new one will replace the old one.
-    /// </summary>
-    [DataField, ValidatePrototypeId<MoodCategoryPrototype>]
-    public string? Category;
-    /// <summary>
-    ///     How much should this moodlet modify an entity's Mood.
-    /// </summary>
-    [DataField(required: true)]
-    public float MoodChange;
-    /// <summary>
-    ///     How long, in Seconds, does this moodlet last? If omitted, the moodlet will last until canceled by any system.
-    /// </summary>
-    [DataField]
-    public int Timeout;
-    /// <summary>
-    ///     Should this moodlet be hidden from the player? EG: No popups or chat messages.
-    /// </summary>
-    [DataField]
-    public bool Hidden;
-}
diff --git a/Content.Shared/_CorvaxNext/Mood/MoodEvents.cs b/Content.Shared/_CorvaxNext/Mood/MoodEvents.cs
deleted file mode 100644
index 6f24ae3bec1..00000000000
--- a/Content.Shared/_CorvaxNext/Mood/MoodEvents.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._CorvaxNext.Mood;
-
-[Serializable, NetSerializable]
-public sealed class MoodEffectEvent : EntityEventArgs
-{
-    /// <summary>
-    ///     ID of the moodlet prototype to use
-    /// </summary>
-    public string EffectId;
-
-    /// <summary>
-    ///     How much should the mood change be multiplied by
-    ///     <br />
-    ///     This does nothing if the moodlet ID matches one with the same Category
-    /// </summary>
-    public float EffectModifier = 1f;
-
-    /// <summary>
-    ///     How much should the mood change be offset by, after multiplication
-    ///     <br />
-    ///     This does nothing if the moodlet ID matches one with the same Category
-    /// </summary>
-    public float EffectOffset = 0f;
-
-    public MoodEffectEvent(string effectId, float effectModifier = 1f, float effectOffset = 0f)
-    {
-        EffectId = effectId;
-        EffectModifier = effectModifier;
-        EffectOffset = effectOffset;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed class MoodRemoveEffectEvent : EntityEventArgs
-{
-    public string EffectId;
-
-    public MoodRemoveEffectEvent(string effectId)
-    {
-        EffectId = effectId;
-    }
-}
-
-/// <summary>
-///     This event is raised whenever an entity sets their mood, allowing other systems to modify the end result of mood math.
-///     EG: The end result after tallying up all Moodlets comes out to 70, but a trait multiplies it by 0.8 to make it 56.
-/// </summary>
-[ByRefEvent]
-public record struct OnSetMoodEvent(EntityUid Receiver, float MoodChangedAmount, bool Cancelled);
-
-/// <summary>
-///     This event is raised on an entity when it receives a mood effect, but before the effects are calculated.
-///     Allows for other systems to pick and choose specific events to modify.
-/// </summary>
-[ByRefEvent]
-public record struct OnMoodEffect(EntityUid Receiver, string EffectId, float EffectModifier = 1, float EffectOffset = 0);
-
diff --git a/Content.Shared/_CorvaxNext/Mood/SharedMoodComponent.cs b/Content.Shared/_CorvaxNext/Mood/SharedMoodComponent.cs
deleted file mode 100644
index 68ef0d4ee60..00000000000
--- a/Content.Shared/_CorvaxNext/Mood/SharedMoodComponent.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-
-using Content.Shared.Alert;
-using Content.Shared.FixedPoint;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Generic;
-
-namespace Content.Shared._CorvaxNext.Mood;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class MoodComponent : Component
-{
-    public override bool SendOnlyToOwner => true;
-
-    [DataField, AutoNetworkedField]
-    public float CurrentMoodLevel;
-
-    [DataField, AutoNetworkedField]
-    public float NeutralMoodThreshold;
-
-    [DataField]
-    public MoodThreshold CurrentMoodThreshold;
-
-    [DataField]
-    public MoodThreshold LastThreshold;
-
-    [ViewVariables(VVAccess.ReadOnly)]
-    public readonly Dictionary<string, string> CategorisedEffects = new();
-
-    [ViewVariables(VVAccess.ReadOnly)]
-    public readonly Dictionary<string, float> UncategorisedEffects = new();
-
-    /// <summary>
-    ///     The formula for the movement speed modifier is SpeedBonusGrowth ^ (MoodLevel - MoodThreshold.Neutral).
-    ///     Change this ONLY BY 0.001 AT A TIME.
-    /// </summary>
-    [DataField]
-    public float SpeedBonusGrowth = 1.003f;
-
-    /// <summary>
-    ///     The lowest point that low morale can multiply our movement speed by. Lowering speed follows a linear curve, rather than geometric.
-    /// </summary>
-    [DataField]
-    public float MinimumSpeedModifier = 0.90f;
-
-    /// <summary>
-    ///     The maximum amount that high morale can multiply our movement speed by. This follows a significantly slower geometric sequence.
-    /// </summary>
-    [DataField]
-    public float MaximumSpeedModifier = 1.15f;
-
-    [DataField]
-    public float IncreaseCritThreshold = 1.2f;
-
-    [DataField]
-    public float DecreaseCritThreshold = 0.9f;
-
-    /// <summary>
-    ///     Multiplier for positive mood effects.
-    /// </summary>
-    [DataField]
-    public float GoodMoodMultiplier = 1.0f;
-
-    /// <summary>
-    ///     Multiplier for negative mood effects.
-    /// </summary>
-    [DataField]
-    public float BadMoodMultiplier = 1.0f;
-
-    [DataField]
-    public MoodThreshold BuffsMoodThreshold = MoodThreshold.Good;
-
-    [DataField]
-    public MoodThreshold ConsMoodThreshold = MoodThreshold.Bad;
-
-    [ViewVariables(VVAccess.ReadOnly)]
-    public FixedPoint2 CritThresholdBeforeModify;
-
-    [DataField(customTypeSerializer: typeof(DictionarySerializer<MoodThreshold, float>))]
-    public Dictionary<MoodThreshold, float> MoodThresholds = new()
-    {
-        { MoodThreshold.Perfect, 100f },
-        { MoodThreshold.Exceptional, 80f },
-        { MoodThreshold.Great, 70f },
-        { MoodThreshold.Good, 60f },
-        { MoodThreshold.Neutral, 50f },
-        { MoodThreshold.Meh, 40f },
-        { MoodThreshold.Bad, 30f },
-        { MoodThreshold.Terrible, 20f },
-        { MoodThreshold.Horrible, 10f },
-        { MoodThreshold.Dead, 0f }
-    };
-
-    [DataField(customTypeSerializer: typeof(DictionarySerializer<MoodThreshold, ProtoId<AlertPrototype>>))]
-    public Dictionary<MoodThreshold, ProtoId<AlertPrototype>> MoodThresholdsAlerts = new()
-    {
-        { MoodThreshold.Dead, "MoodDead" },
-        { MoodThreshold.Horrible, "MoodHorrible" },
-        { MoodThreshold.Terrible, "MoodTerrible" },
-        { MoodThreshold.Bad, "MoodBad" },
-        { MoodThreshold.Meh, "MoodMeh" },
-        { MoodThreshold.Neutral, "MoodNeutral" },
-        { MoodThreshold.Good, "MoodGood" },
-        { MoodThreshold.Great, "MoodGreat" },
-        { MoodThreshold.Exceptional, "MoodExceptional" },
-        { MoodThreshold.Perfect, "MoodPerfect" },
-        { MoodThreshold.Insane, "MoodInsane" }
-    };
-
-    /// <summary>
-    ///     These thresholds represent a percentage of Crit-Threshold, 0.8 corresponding with 80%.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(DictionarySerializer<string, float>))]
-    public Dictionary<string, float> HealthMoodEffectsThresholds = new()
-    {
-        { "HealthHeavyDamage", 0.8f },
-        { "HealthSevereDamage", 0.5f },
-        { "HealthOkayDamage", 0.35f },
-        { "HealthLightDamage", 0.1f },
-        { "HealthNoDamage", 0.05f }
-    };
-}
-
-[Serializable]
-public enum MoodThreshold : ushort
-{
-    Insane = 1,
-    Horrible = 2,
-    Terrible = 3,
-    Bad = 4,
-    Meh = 5,
-    Neutral = 6,
-    Good = 7,
-    Great = 8,
-    Exceptional = 9,
-    Perfect = 10,
-    Dead = 0
-}
diff --git a/Content.Shared/_CorvaxNext/NextVars.cs b/Content.Shared/_CorvaxNext/NextVars.cs
index 2c4b623dc00..69fde0ef6cc 100644
--- a/Content.Shared/_CorvaxNext/NextVars.cs
+++ b/Content.Shared/_CorvaxNext/NextVars.cs
@@ -10,8 +10,8 @@ namespace Content.Shared._CorvaxNext.NextVars;
 public sealed class NextVars
 {
     /**
-     * Auto cryo sleep
-     */
+    * Auto cryo sleep
+    */
 
     public static readonly CVarDef<bool> AutoCryoSleepEnabled =
         CVarDef.Create("auto_cryo_sleep.enabled", true, CVar.SERVER);
@@ -28,16 +28,6 @@ public sealed class NextVars
     public static readonly CVarDef<bool> OfferModeIndicatorsPointShow =
         CVarDef.Create("hud.offer_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
 
-    /// <summary>
-    /// CorvaxNext Surgery cvars
-    /// </summary>
-    #region Surgery
-
-    public static readonly CVarDef<bool> CanOperateOnSelf =
-        CVarDef.Create("surgery.can_operate_on_self", false, CVar.SERVERONLY);
-
-    #endregion
-
     /*
      * _CorvaxNext Bind Standing and Laying System
      */
@@ -54,17 +44,4 @@ public sealed class NextVars
 
     // public static readonly CVarDef<bool> OfferModeIndicatorsPointShow =
     //     CVarDef.Create("hud.offer_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-    public static readonly CVarDef<bool> MoodEnabled =
-        CVarDef.Create("mood.enabled", true, CVar.SERVER);
-
-    public static readonly CVarDef<bool> MoodIncreasesSpeed =
-        CVarDef.Create("mood.increases_speed", true, CVar.SERVER);
-
-    public static readonly CVarDef<bool> MoodDecreasesSpeed =
-        CVarDef.Create("mood.decreases_speed", true, CVar.SERVER);
-
-    public static readonly CVarDef<bool> MoodModifiesThresholds =
-        CVarDef.Create("mood.modify_thresholds", false, CVar.SERVER);
-
 }
diff --git a/Content.Shared/_CorvaxNext/Overlays/SaturationScaleComponent.cs b/Content.Shared/_CorvaxNext/Overlays/SaturationScaleComponent.cs
deleted file mode 100644
index 6128dec9f8f..00000000000
--- a/Content.Shared/_CorvaxNext/Overlays/SaturationScaleComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Overlays;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SaturationScaleOverlayComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Standing/SharedLayingDownSystem.cs b/Content.Shared/_CorvaxNext/Standing/SharedLayingDownSystem.cs
index 2a86d89bac3..843ee74b47a 100644
--- a/Content.Shared/_CorvaxNext/Standing/SharedLayingDownSystem.cs
+++ b/Content.Shared/_CorvaxNext/Standing/SharedLayingDownSystem.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared._CorvaxNext.NextVars;
-using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Body.Components;
 using Content.Shared.Buckle;
 using Content.Shared.Buckle.Components;
@@ -322,7 +321,7 @@ standingState.CurrentState is not StandingState.Lying ||
                 obj.Value,
                 uid,
                 PopupType.MediumCaution);
-            _damageable.TryChangeDamage(uid, new DamageSpecifier() { DamageDict = { { "Blunt", 5 } } }, ignoreResistances: true, canEvade: true, targetPart: TargetBodyPart.Head);
+            _damageable.TryChangeDamage(uid, new DamageSpecifier() { DamageDict = { { "Blunt", 5 } } }, ignoreResistances: true);
             _stun.TryStun(uid, TimeSpan.FromSeconds(2), true);
             _audioSystem.PlayPredicted(_bonkSound, uid, obj.Value);
             return false;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/AmputateAttemptEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/AmputateAttemptEvent.cs
deleted file mode 100644
index b71a0407bf2..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/AmputateAttemptEvent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Body.Events;
-
-/// <summary>
-/// Raised on an entity when attempting to remove a body part.
-/// </summary>
-[ByRefEvent]
-public readonly record struct AmputateAttemptEvent(EntityUid Part);
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/BodyPartAppearanceComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/BodyPartAppearanceComponent.cs
deleted file mode 100644
index 0b440db3a41..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/BodyPartAppearanceComponent.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Humanoid.Markings;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Body.Part;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
-public sealed partial class BodyPartAppearanceComponent : Component
-{
-    /// <summary>
-    ///     HumanoidVisualLayer type for this body part.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public HumanoidVisualLayers Type { get; set; }
-
-    /// <summary>
-    ///     Relevant markings for this body part that will be applied on attachment.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Dictionary<HumanoidVisualLayers, List<Marking>> Markings = new();
-
-    /// <summary>
-    ///     ID of this custom base layer. Must be a <see cref="HumanoidSpeciesSpriteLayer"/>.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<HumanoidSpeciesSpriteLayer>)), AutoNetworkedField]
-    public string? ID { get; set; }
-
-    /// <summary>
-    ///     Color of this custom base layer. Null implies skin colour if the corresponding <see cref="HumanoidSpeciesSpriteLayer"/> is set to match skin.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Color? Color { get; set; }
-
-    /// <summary>
-    ///     Color of this custom base eye layer. Null implies eye colour if the corresponding <see cref="HumanoidSpeciesSpriteLayer"/> is set to match skin.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Color? EyeColor { get; set; }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/CyberneticsComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/CyberneticsComponent.cs
deleted file mode 100644
index f06646ec85e..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/CyberneticsComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body;
-
-/// <summary>
-/// Component for cybernetic implants that can be installed in entities
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class CyberneticsComponent : Component
-{
-    /// <summary>
-    ///     Is the cybernetic implant disabled by EMPs, etc?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Disabled = false;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/DebrainedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/DebrainedComponent.cs
deleted file mode 100644
index dae95a87243..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/DebrainedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body;
-
-[RegisterComponent]
-public sealed partial class DebrainedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Events/BodyPartEvents.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Events/BodyPartEvents.cs
deleted file mode 100644
index 7ec2c061fa2..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Events/BodyPartEvents.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Body.Part;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Events;
-
-/// <summary>
-/// Raised on an entity when attempting to remove a body part.
-/// </summary>
-[ByRefEvent]
-public readonly record struct AmputateAttemptEvent(EntityUid Part);
-
-// start-_CorvaxNext: surgery
-// Kind of a clone of BodyPartAddedEvent for surgical reattachment specifically.
-[ByRefEvent]
-public readonly record struct BodyPartAttachedEvent(Entity<BodyPartComponent> Part);
-// end-_CorvaxNext: surgery
-
-// start-_CorvaxNext: surgery
-// Kind of a clone of BodyPartRemovedEvent for any instances where we call DropPart(), reasoning being that RemovedEvent fires off
-// a lot more often than what I'd like due to PVS.
-[ByRefEvent]
-public readonly record struct BodyPartDroppedEvent(Entity<BodyPartComponent> Part);
-
-[ByRefEvent]
-public readonly record struct BodyPartEnableChangedEvent(bool Enabled);
-
-[ByRefEvent]
-public readonly record struct BodyPartEnabledEvent(Entity<BodyPartComponent> Part);
-
-[ByRefEvent]
-public readonly record struct BodyPartDisabledEvent(Entity<BodyPartComponent> Part);
-
-[ByRefEvent]
-public readonly record struct BodyPartAddedEvent(string Slot, Entity<BodyPartComponent> Part);
-
-[ByRefEvent]
-public readonly record struct BodyPartRemovedEvent(string Slot, Entity<BodyPartComponent> Part);
-
-public readonly record struct BodyPartComponentsModifyEvent(EntityUid Body, bool Add);
-// end-_CorvaxNext: surgery
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/BodyPartEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/BodyPartEffectComponent.cs
deleted file mode 100644
index c2ee98bbf30..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/BodyPartEffectComponent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentPause]
-public sealed partial class BodyPartEffectComponent : Component
-{
-    /// <summary>
-    ///     The components that are active on the part and will be refreshed every 5s
-    /// </summary>
-    [DataField]
-    public ComponentRegistry Active = new();
-
-    /// <summary>
-    ///     How long to wait between each refresh.
-    ///     Effects can only last at most this long once the organ is removed.
-    /// </summary>
-    [DataField]
-    public TimeSpan Delay = TimeSpan.FromSeconds(5);
-
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextUpdate = TimeSpan.Zero;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/BodyPartEffectSystem.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/BodyPartEffectSystem.cs
deleted file mode 100644
index 286de4b2cac..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/BodyPartEffectSystem.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager;
-using Robust.Shared.Timing;
-using System.Linq;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-public partial class BodyPartEffectSystem : EntitySystem
-{
-    [Dependency] private readonly ISerializationManager _serManager = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<BodyPartComponent, BodyPartComponentsModifyEvent>(OnPartComponentsModify);
-    }
-
-    // While I would love to kill this function, problem is that if we happen to have two parts that add the same
-    // effect, removing one will remove both of them, since we cant tell what the source of a Component is.
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<BodyPartEffectComponent, BodyPartComponent>();
-        var now = _gameTiming.CurTime;
-        while (query.MoveNext(out var uid, out var comp, out var part))
-        {
-            if (now < comp.NextUpdate || !comp.Active.Any() || part.Body is not { } body)
-                continue;
-
-            comp.NextUpdate = now + comp.Delay;
-            AddComponents(body, uid, comp.Active);
-        }
-    }
-
-    private void OnPartComponentsModify(Entity<BodyPartComponent> partEnt,
-        ref BodyPartComponentsModifyEvent ev)
-    {
-        if (partEnt.Comp.OnAdd != null)
-        {
-            if (ev.Add)
-                AddComponents(ev.Body, partEnt, partEnt.Comp.OnAdd);
-            else
-                RemoveComponents(ev.Body, partEnt, partEnt.Comp.OnAdd);
-        }
-
-        if (partEnt.Comp.OnRemove != null)
-        {
-            if (ev.Add)
-                AddComponents(ev.Body, partEnt, partEnt.Comp.OnRemove);
-            else
-                RemoveComponents(ev.Body, partEnt, partEnt.Comp.OnRemove);
-        }
-
-        Dirty(partEnt, partEnt.Comp);
-    }
-
-    private void AddComponents(EntityUid body,
-        EntityUid part,
-        ComponentRegistry reg,
-        BodyPartEffectComponent? effectComp = null)
-    {
-        if (!Resolve(part, ref effectComp, logMissing: false))
-            return;
-
-        foreach (var (key, comp) in reg)
-        {
-            var compType = comp.Component.GetType();
-            if (HasComp(body, compType))
-                continue;
-
-            var newComp = (Component) _serManager.CreateCopy(comp.Component, notNullableOverride: true);
-            EntityManager.AddComponent(body, newComp, true);
-
-            effectComp.Active[key] = comp;
-        }
-    }
-
-    private void RemoveComponents(EntityUid body,
-        EntityUid part,
-        ComponentRegistry reg,
-        BodyPartEffectComponent? effectComp = null)
-    {
-        if (!Resolve(part, ref effectComp, logMissing: false))
-            return;
-
-        foreach (var (key, comp) in reg)
-        {
-            RemComp(body, comp.Component.GetType());
-            effectComp.Active.Remove(key);
-        }
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EarsComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EarsComponent.cs
deleted file mode 100644
index 006d4243951..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EarsComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-[RegisterComponent]
-public sealed partial class EarsComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EyesComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EyesComponent.cs
deleted file mode 100644
index f96cba4d616..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EyesComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-[RegisterComponent]
-public sealed partial class EyesComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/HeartComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/HeartComponent.cs
deleted file mode 100644
index 55ea025d1dd..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/HeartComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-[RegisterComponent]
-public sealed partial class HeartComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/LiverComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/LiverComponent.cs
deleted file mode 100644
index 4001ece74b1..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/LiverComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-[RegisterComponent]
-public sealed partial class LiverComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/MarkingContainerComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/MarkingContainerComponent.cs
deleted file mode 100644
index a07de8614fb..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/MarkingContainerComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// This is a uh, very shitty copout to not wanting to modify the prototypes for felinids, and entities at large so they have ears.
-// I will do that at some point, for now I just want the funny surgery to work lol.
-using Robust.Shared.GameStates;
-using Content.Shared.Humanoid.Markings;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class MarkingContainerComponent : Component
-{
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MarkingPrototype>))]
-    public string Marking = default!;
-
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/OrganEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/OrganEffectComponent.cs
deleted file mode 100644
index 5d5cb770e68..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/OrganEffectComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// We keep this clone of the other component since I don't know yet if I'll need organ specific functions in the future.
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentPause]
-public sealed partial class OrganEffectComponent : Component
-{
-    /// <summary>
-    ///     The components that are active on the part and will be refreshed every 5s
-    /// </summary>
-    [DataField]
-    public ComponentRegistry Active = new();
-
-    /// <summary>
-    ///     How long to wait between each refresh.
-    ///     Effects can only last at most this long once the organ is removed.
-    /// </summary>
-    [DataField]
-    public TimeSpan Delay = TimeSpan.FromSeconds(5);
-
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextUpdate = TimeSpan.Zero;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/OrganEffectSystem.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/OrganEffectSystem.cs
deleted file mode 100644
index 590990adc51..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/OrganEffectSystem.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// We keep this clone of the other system since I don't know yet if I'll need organ specific functions in the future.
-// will delete or refactor as time goes on.
-using Content.Shared.Body.Organ;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager;
-using Robust.Shared.Timing;
-using System.Linq;
-using Robust.Shared.Network;
-
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-public partial class OrganEffectSystem : EntitySystem
-{
-    [Dependency] private readonly IComponentFactory _compFactory = default!;
-    [Dependency] private readonly ISerializationManager _serManager = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly INetManager _net = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<OrganComponent, OrganComponentsModifyEvent>(OnOrganComponentsModify);
-    }
-
-    // While I would love to kill this function, problem is that if we happen to have two parts that add the same
-    // effect, removing one will remove both of them, since we cant tell what the source of a Component is.
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        if (!_net.IsServer) // TODO: Kill this once I figure out whats breaking the Diagnostic Cybernetics.
-            return;
-
-        var query = EntityQueryEnumerator<OrganEffectComponent, OrganComponent>();
-        var now = _gameTiming.CurTime;
-        while (query.MoveNext(out var uid, out var comp, out var part))
-        {
-            if (now < comp.NextUpdate || !comp.Active.Any() || part.Body is not { } body)
-                continue;
-
-            comp.NextUpdate = now + comp.Delay;
-            AddComponents(body, uid, comp.Active);
-        }
-    }
-
-    private void OnOrganComponentsModify(Entity<OrganComponent> organEnt,
-        ref OrganComponentsModifyEvent ev)
-    {
-        if (!_net.IsServer) // TODO: Kill this once I figure out whats breaking the Diagnostic Cybernetics.
-            return;
-
-        if (organEnt.Comp.OnAdd != null)
-        {
-            if (ev.Add)
-                AddComponents(ev.Body, organEnt, organEnt.Comp.OnAdd);
-            else
-                RemoveComponents(ev.Body, organEnt, organEnt.Comp.OnAdd);
-        }
-
-        if (organEnt.Comp.OnRemove != null)
-        {
-            if (ev.Add)
-                AddComponents(ev.Body, organEnt, organEnt.Comp.OnRemove);
-            else
-                RemoveComponents(ev.Body, organEnt, organEnt.Comp.OnRemove);
-        }
-    }
-
-    private void AddComponents(EntityUid body,
-        EntityUid part,
-        ComponentRegistry reg,
-        OrganEffectComponent? effectComp = null)
-    {
-        if (!Resolve(part, ref effectComp, logMissing: false))
-            return;
-
-        foreach (var (key, comp) in reg)
-        {
-            var compType = comp.Component.GetType();
-            if (HasComp(body, compType))
-                continue;
-
-            var newComp = (Component) _serManager.CreateCopy(comp.Component, notNullableOverride: true);
-            newComp.Owner = body;
-            EntityManager.AddComponent(body, newComp, true);
-            effectComp.Active[key] = comp;
-            if (newComp.NetSyncEnabled)
-            {
-                Dirty(body, newComp);
-                Dirty(part, effectComp);
-            }
-        }
-    }
-
-    private void RemoveComponents(EntityUid body,
-        EntityUid part,
-        ComponentRegistry reg,
-        OrganEffectComponent? effectComp = null)
-    {
-        if (!Resolve(part, ref effectComp, logMissing: false))
-            return;
-
-        foreach (var (key, comp) in reg)
-        {
-            RemComp(body, comp.Component.GetType());
-            effectComp.Active.Remove(key);
-        }
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/OrganEvents.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/OrganEvents.cs
deleted file mode 100644
index f757bd437ae..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/OrganEvents.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Shared.Body.Organ;
-namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
-
-public readonly record struct OrganComponentsModifyEvent(EntityUid Body, bool Add);
-
-[ByRefEvent]
-public readonly record struct OrganEnableChangedEvent(bool Enabled);
-
-[ByRefEvent]
-public readonly record struct OrganEnabledEvent(Entity<OrganComponent> Organ);
-
-[ByRefEvent]
-public readonly record struct OrganDisabledEvent(Entity<OrganComponent> Organ);
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.PartAppearance.cs b/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.PartAppearance.cs
deleted file mode 100644
index 19d13592f6a..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.PartAppearance.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using System.Linq;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Content.Shared.Humanoid.Prototypes;
-using Robust.Shared.Prototypes;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
-
-// ReSharper disable once CheckNamespace
-namespace Content.Shared.Body.Systems;
-
-public partial class SharedBodySystem
-{
-    [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoid = default!;
-    [Dependency] private readonly MarkingManager _markingManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    private void InitializePartAppearances()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<BodyPartAppearanceComponent, ComponentStartup>(OnPartAppearanceStartup);
-        SubscribeLocalEvent<BodyPartAppearanceComponent, AfterAutoHandleStateEvent>(HandleState);
-        SubscribeLocalEvent<BodyComponent, BodyPartAddedEvent>(OnPartAttachedToBody);
-        SubscribeLocalEvent<BodyComponent, BodyPartRemovedEvent>(OnPartDroppedFromBody);
-    }
-
-    private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent component, ComponentStartup args)
-    {
-        if (!TryComp(uid, out BodyPartComponent? part)
-            || part.ToHumanoidLayers() is not { } relevantLayer)
-
-            return;
-
-        if (part.BaseLayerId != null)
-        {
-            component.ID = part.BaseLayerId;
-            component.Type = relevantLayer;
-            return;
-        }
-
-        if (part.Body is not { Valid: true } body
-            || !TryComp(body, out HumanoidAppearanceComponent? bodyAppearance))
-            return;
-
-        var customLayers = bodyAppearance.CustomBaseLayers;
-        var spriteLayers = bodyAppearance.BaseLayers;
-        component.Type = relevantLayer;
-
-        part.Species = bodyAppearance.Species;
-
-        if (customLayers.ContainsKey(component.Type))
-        {
-            component.ID = customLayers[component.Type].Id;
-            component.Color = customLayers[component.Type].Color;
-        }
-        else if (spriteLayers.ContainsKey(component.Type))
-        {
-            component.ID = spriteLayers[component.Type].ID;
-            component.Color = bodyAppearance.SkinColor;
-        }
-        else
-        {
-            component.ID = CreateIdFromPart(bodyAppearance, relevantLayer);
-            component.Color = bodyAppearance.SkinColor;
-        }
-
-        // I HATE HARDCODED CHECKS I HATE HARDCODED CHECKS I HATE HARDCODED CHECKS
-        if (part.PartType == BodyPartType.Head)
-            component.EyeColor = bodyAppearance.EyeColor;
-
-        var markingsByLayer = new Dictionary<HumanoidVisualLayers, List<Marking>>();
-
-        foreach (var layer in HumanoidVisualLayersExtension.Sublayers(relevantLayer))
-        {
-            var category = MarkingCategoriesConversion.FromHumanoidVisualLayers(layer);
-            if (bodyAppearance.MarkingSet.Markings.TryGetValue(category, out var markingList))
-                markingsByLayer[layer] = markingList.Select(m => new Marking(m.MarkingId, m.MarkingColors.ToList())).ToList();
-        }
-
-        component.Markings = markingsByLayer;
-    }
-
-    private string? CreateIdFromPart(HumanoidAppearanceComponent bodyAppearance, HumanoidVisualLayers part)
-    {
-        var speciesProto = _prototypeManager.Index(bodyAppearance.Species);
-        var baseSprites = _prototypeManager.Index<HumanoidSpeciesBaseSpritesPrototype>(speciesProto.SpriteSet);
-
-        if (!baseSprites.Sprites.ContainsKey(part))
-            return null;
-
-        return HumanoidVisualLayersExtension.GetSexMorph(part, bodyAppearance.Sex, baseSprites.Sprites[part]);
-    }
-
-    public void ModifyMarkings(EntityUid uid,
-        Entity<BodyPartAppearanceComponent?> partAppearance,
-        HumanoidAppearanceComponent bodyAppearance,
-        HumanoidVisualLayers targetLayer,
-        string markingId,
-        bool remove = false)
-    {
-
-        if (!Resolve(partAppearance, ref partAppearance.Comp))
-            return;
-
-        if (!remove)
-        {
-
-            if (!_markingManager.Markings.TryGetValue(markingId, out var prototype))
-                return;
-
-            var markingColors = MarkingColoring.GetMarkingLayerColors(
-                    prototype,
-                    bodyAppearance.SkinColor,
-                    bodyAppearance.EyeColor,
-                    bodyAppearance.MarkingSet
-                );
-
-            var marking = new Marking(markingId, markingColors);
-
-            _humanoid.SetLayerVisibility(uid, targetLayer, true, true, bodyAppearance);
-            _humanoid.AddMarking(uid, markingId, markingColors, true, true, bodyAppearance);
-            if (!partAppearance.Comp.Markings.ContainsKey(targetLayer))
-                partAppearance.Comp.Markings[targetLayer] = new List<Marking>();
-
-            partAppearance.Comp.Markings[targetLayer].Add(marking);
-        }
-        //else
-        //RemovePartMarkings(uid, component, bodyAppearance);
-    }
-
-    private void HandleState(EntityUid uid, BodyPartAppearanceComponent component, ref AfterAutoHandleStateEvent args) =>
-        ApplyPartMarkings(uid, component);
-
-    private void OnPartAttachedToBody(EntityUid uid, BodyComponent component, ref BodyPartAddedEvent args)
-    {
-        if (!TryComp(args.Part, out BodyPartAppearanceComponent? partAppearance)
-            || !TryComp(uid, out HumanoidAppearanceComponent? bodyAppearance))
-            return;
-
-        if (partAppearance.ID != null)
-            _humanoid.SetBaseLayerId(uid, partAppearance.Type, partAppearance.ID, sync: true, bodyAppearance);
-
-        UpdateAppearance(uid, partAppearance);
-    }
-
-    private void OnPartDroppedFromBody(EntityUid uid, BodyComponent component, ref BodyPartRemovedEvent args)
-    {
-        if (TerminatingOrDeleted(uid)
-            || TerminatingOrDeleted(args.Part)
-            || !TryComp(uid, out HumanoidAppearanceComponent? bodyAppearance))
-            return;
-
-        // We check for this conditional here since some entities may not have a profile... If they dont
-        // have one, and their part is gibbed, the markings will not be removed or applied properly.
-        if (!HasComp<BodyPartAppearanceComponent>(args.Part))
-            EnsureComp<BodyPartAppearanceComponent>(args.Part);
-
-        if (TryComp<BodyPartAppearanceComponent>(args.Part, out var partAppearance))
-            RemoveAppearance(uid, partAppearance, args.Part);
-    }
-
-    protected void UpdateAppearance(EntityUid target,
-        BodyPartAppearanceComponent component)
-    {
-        if (!TryComp(target, out HumanoidAppearanceComponent? bodyAppearance))
-            return;
-
-        if (component.EyeColor != null)
-            bodyAppearance.EyeColor = component.EyeColor.Value;
-
-        if (component.Color != null)
-            _humanoid.SetBaseLayerColor(target, component.Type, component.Color, true, bodyAppearance);
-
-        _humanoid.SetLayerVisibility(target, component.Type, true, true, bodyAppearance);
-
-        foreach (var (visualLayer, markingList) in component.Markings)
-        {
-            _humanoid.SetLayerVisibility(target, visualLayer, true, true, bodyAppearance);
-            foreach (var marking in markingList)
-                _humanoid.AddMarking(target, marking.MarkingId, marking.MarkingColors, false, true, bodyAppearance);
-        }
-
-        Dirty(target, bodyAppearance);
-    }
-
-    protected void RemoveAppearance(EntityUid entity, BodyPartAppearanceComponent component, EntityUid partEntity)
-    {
-        if (!TryComp(entity, out HumanoidAppearanceComponent? bodyAppearance))
-            return;
-
-        foreach (var (visualLayer, markingList) in component.Markings)
-        {
-            _humanoid.SetLayerVisibility(entity, visualLayer, false, true, bodyAppearance);
-        }
-        RemoveBodyMarkings(entity, component, bodyAppearance);
-    }
-
-    protected abstract void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component);
-
-    protected abstract void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance);
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.Targeting.cs b/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.Targeting.cs
deleted file mode 100644
index 1cfe9e6b3a7..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.Targeting.cs
+++ /dev/null
@@ -1,500 +0,0 @@
-using System.Linq;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Content.Shared.Damage;
-using Content.Shared.Mobs.Components;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Standing;
-using Content.Shared._CorvaxNext.Targeting;
-using Robust.Shared.CPUJob.JobQueues;
-using Robust.Shared.CPUJob.JobQueues.Queues;
-using Robust.Shared.Network;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-using System.Threading;
-using System.Threading.Tasks;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
-using Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.FixedPoint;
-using Content.Shared.Inventory;
-
-// ReSharper disable once CheckNamespace
-namespace Content.Shared.Body.Systems;
-
-public partial class SharedBodySystem
-{
-    [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-
-    private readonly string[] _severingDamageTypes = { "Slash", "Pierce", "Blunt" };
-
-    private const double IntegrityJobTime = 0.005;
-    private readonly JobQueue _integrityJobQueue = new(IntegrityJobTime);
-    public sealed class IntegrityJob : Job<object>
-    {
-        private readonly SharedBodySystem _self;
-        private readonly Entity<BodyPartComponent> _ent;
-        public IntegrityJob(SharedBodySystem self, Entity<BodyPartComponent> ent, double maxTime, CancellationToken cancellation = default) : base(maxTime, cancellation)
-        {
-            _self = self;
-            _ent = ent;
-        }
-
-        public IntegrityJob(SharedBodySystem self, Entity<BodyPartComponent> ent, double maxTime, IStopwatch stopwatch, CancellationToken cancellation = default) : base(maxTime, stopwatch, cancellation)
-        {
-            _self = self;
-            _ent = ent;
-        }
-
-        protected override Task<object?> Process()
-        {
-            _self.ProcessIntegrityTick(_ent);
-
-            return Task.FromResult<object?>(null);
-        }
-    }
-
-    private EntityQuery<TargetingComponent> _queryTargeting;
-    private void InitializeBkm()
-    {
-        _queryTargeting = GetEntityQuery<TargetingComponent>();
-        SubscribeLocalEvent<BodyComponent, TryChangePartDamageEvent>(OnTryChangePartDamage);
-        SubscribeLocalEvent<BodyComponent, DamageModifyEvent>(OnBodyDamageModify);
-        SubscribeLocalEvent<BodyPartComponent, DamageModifyEvent>(OnPartDamageModify);
-        SubscribeLocalEvent<BodyPartComponent, DamageChangedEvent>(OnDamageChanged);
-    }
-
-    public DamageSpecifier GetHealingSpecifier(BodyPartComponent part)
-    {
-        var damage = new DamageSpecifier()
-        {
-            DamageDict = new Dictionary<string, FixedPoint2>()
-            {
-                { "Blunt", -part.SelfHealingAmount },
-                { "Slash", -part.SelfHealingAmount },
-                { "Piercing", -part.SelfHealingAmount },
-                { "Heat", -part.SelfHealingAmount },
-                { "Cold", -part.SelfHealingAmount },
-                { "Shock", -part.SelfHealingAmount },
-                { "Caustic", -part.SelfHealingAmount * 0.1}, // not much caustic healing
-            }
-        };
-
-        return damage;
-    }
-
-    private void ProcessIntegrityTick(Entity<BodyPartComponent> entity)
-    {
-        if (!TryComp<DamageableComponent>(entity, out var damageable))
-            return;
-
-        var damage = damageable.TotalDamage;
-
-        if (entity.Comp is { Body: { } body }
-            && damage > entity.Comp.MinIntegrity
-            && damage <= entity.Comp.IntegrityThresholds[TargetIntegrity.HeavilyWounded]
-            && _queryTargeting.HasComp(body)
-            && !_mobState.IsDead(body))
-            _damageable.TryChangeDamage(entity, GetHealingSpecifier(entity), canSever: false, targetPart: GetTargetBodyPart(entity));
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-        _integrityJobQueue.Process();
-
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
-        using var query = EntityQueryEnumerator<BodyPartComponent>();
-        while (query.MoveNext(out var ent, out var part))
-        {
-            part.HealingTimer += frameTime;
-
-            if (part.HealingTimer >= part.HealingTime)
-            {
-                part.HealingTimer = 0;
-                _integrityJobQueue.EnqueueJob(new IntegrityJob(this, (ent, part), IntegrityJobTime));
-            }
-        }
-    }
-
-    private void OnTryChangePartDamage(Entity<BodyComponent> ent, ref TryChangePartDamageEvent args)
-    {
-        // If our target has a TargetingComponent, that means they will take limb damage
-        // And if their attacker also has one, then we use that part.
-        if (_queryTargeting.TryComp(ent, out var targetEnt))
-        {
-            var damage = args.Damage;
-            TargetBodyPart? targetPart = null;
-
-            if (args.TargetPart != null)
-            {
-                targetPart = args.TargetPart;
-            }
-            else if (args.Origin.HasValue && _queryTargeting.TryComp(args.Origin.Value, out var targeter))
-            {
-                targetPart = targeter.Target;
-                // If the target is Torso then have a 33% chance to hit another part
-                if (targetPart.Value == TargetBodyPart.Torso)
-                {
-                    var additionalPart = GetRandomPartSpread(_random, 10);
-                    targetPart = targetPart.Value | additionalPart;
-                }
-            }
-            else
-            {
-                // If there's an origin in this case, that means it comes from an entity without TargetingComponent,
-                // such as an animal, so we attack a random part.
-                if (args.Origin.HasValue)
-                {
-                    targetPart = GetRandomBodyPart(ent, targetEnt);
-                }
-                // Otherwise we damage all parts equally (barotrauma, explosions, etc).
-                else if (damage != null)
-                {
-                    // Division by 2 cuz damaging all parts by the same damage by default is too much.
-                    damage /= 2;
-                    targetPart = TargetBodyPart.All;
-                }
-            }
-
-            if (targetPart == null)
-                return;
-
-            if (!TryChangePartDamage(ent, args.Damage, args.CanSever, args.CanEvade, args.PartMultiplier, targetPart.Value)
-                && args.CanEvade)
-            {
-                _popup.PopupEntity(Loc.GetString("surgery-part-damage-evaded", ("user", Identity.Entity(ent, EntityManager))), ent);
-                args.Evaded = true;
-            }
-        }
-    }
-
-    private void OnBodyDamageModify(Entity<BodyComponent> bodyEnt, ref DamageModifyEvent args)
-    {
-        if (args.TargetPart != null)
-        {
-            var (targetType, _) = ConvertTargetBodyPart(args.TargetPart.Value);
-            args.Damage *= GetPartDamageModifier(targetType);
-        }
-    }
-
-    private void OnPartDamageModify(Entity<BodyPartComponent> partEnt, ref DamageModifyEvent args)
-    {
-        if (partEnt.Comp.Body != null
-            && TryComp(partEnt.Comp.Body.Value, out InventoryComponent? inventory))
-            _inventory.RelayEvent((partEnt.Comp.Body.Value, inventory), ref args);
-
-        if (_prototypeManager.TryIndex<DamageModifierSetPrototype>("PartDamage", out var partModifierSet))
-            args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, partModifierSet);
-
-        args.Damage *= GetPartDamageModifier(partEnt.Comp.PartType);
-    }
-
-    private bool TryChangePartDamage(EntityUid entity,
-        DamageSpecifier damage,
-        bool canSever,
-        bool canEvade,
-        float partMultiplier,
-        TargetBodyPart targetParts)
-    {
-        var landed = false;
-        var targets = SharedTargetingSystem.GetValidParts();
-        foreach (var target in targets)
-        {
-            if (!targetParts.HasFlag(target))
-                continue;
-
-            var (targetType, targetSymmetry) = ConvertTargetBodyPart(target);
-            if (GetBodyChildrenOfType(entity, targetType, symmetry: targetSymmetry) is { } part)
-            {
-                if (canEvade && TryEvadeDamage(part.FirstOrDefault().Id, GetEvadeChance(targetType)))
-                    continue;
-
-                var damageResult = _damageable.TryChangeDamage(part.FirstOrDefault().Id, damage * partMultiplier, canSever: canSever);
-                if (damageResult != null && damageResult.GetTotal() != 0)
-                    landed = true;
-            }
-        }
-
-        return landed;
-    }
-
-    private void OnDamageChanged(Entity<BodyPartComponent> partEnt, ref DamageChangedEvent args)
-    {
-        if (!TryComp<DamageableComponent>(partEnt, out var damageable))
-            return;
-
-        var severed = false;
-        var partIdSlot = GetParentPartAndSlotOrNull(partEnt)?.Slot;
-        var delta = args.DamageDelta;
-
-        if (args.CanSever
-            && partEnt.Comp.CanSever
-            && partIdSlot is not null
-            && delta != null
-            && !HasComp<BodyPartReattachedComponent>(partEnt)
-            && !partEnt.Comp.Enabled
-            && damageable.TotalDamage >= partEnt.Comp.SeverIntegrity
-            && _severingDamageTypes.Any(damageType => delta.DamageDict.TryGetValue(damageType, out var value) && value > 0))
-            severed = true;
-
-        CheckBodyPart(partEnt, GetTargetBodyPart(partEnt), severed, damageable);
-
-        if (severed)
-            DropPart(partEnt);
-
-        Dirty(partEnt, partEnt.Comp);
-    }
-
-    /// <summary>
-    /// Gets the random body part rolling a number between 1 and 9, and returns
-    /// Torso if the result is 9 or more. The higher torsoWeight is, the higher chance to return it.
-    /// By default, the chance to return Torso is 50%.
-    /// </summary>
-    private static TargetBodyPart GetRandomPartSpread(IRobustRandom random, ushort torsoWeight = 9)
-    {
-        const int targetPartsAmount = 9;
-        // 5 = amount of target parts except Torso
-        return random.Next(1, targetPartsAmount + torsoWeight) switch
-        {
-            1 => TargetBodyPart.Head,
-            2 => TargetBodyPart.RightArm,
-            3 => TargetBodyPart.RightHand,
-            4 => TargetBodyPart.LeftArm,
-            5 => TargetBodyPart.LeftHand,
-            6 => TargetBodyPart.RightLeg,
-            7 => TargetBodyPart.RightFoot,
-            8 => TargetBodyPart.LeftLeg,
-            9 => TargetBodyPart.LeftFoot,
-            _ => TargetBodyPart.Torso,
-        };
-    }
-
-    public TargetBodyPart? GetRandomBodyPart(EntityUid uid, TargetingComponent? target = null)
-    {
-        if (!Resolve(uid, ref target))
-            return null;
-
-        var totalWeight = target.TargetOdds.Values.Sum();
-        var randomValue = _random.NextFloat() * totalWeight;
-
-        foreach (var (part, weight) in target.TargetOdds)
-        {
-            if (randomValue <= weight)
-                return part;
-            randomValue -= weight;
-        }
-
-        return TargetBodyPart.Torso; // Default to torso if something goes wrong
-    }
-
-    /// This should be called after body part damage was changed.
-    /// </summary>
-    public void CheckBodyPart(
-        Entity<BodyPartComponent> partEnt,
-        TargetBodyPart? targetPart,
-        bool severed,
-        DamageableComponent? damageable = null)
-    {
-        if (!Resolve(partEnt, ref damageable))
-            return;
-
-        var integrity = damageable.TotalDamage;
-
-        // KILL the body part
-        if (partEnt.Comp.Enabled && integrity >= partEnt.Comp.IntegrityThresholds[TargetIntegrity.CriticallyWounded])
-        {
-            var ev = new BodyPartEnableChangedEvent(false);
-            RaiseLocalEvent(partEnt, ref ev);
-        }
-
-        // LIVE the body part
-        if (!partEnt.Comp.Enabled && integrity <= partEnt.Comp.IntegrityThresholds[partEnt.Comp.EnableIntegrity] && !severed)
-        {
-            var ev = new BodyPartEnableChangedEvent(true);
-            RaiseLocalEvent(partEnt, ref ev);
-        }
-
-        if (_queryTargeting.TryComp(partEnt.Comp.Body, out var targeting)
-            && HasComp<MobStateComponent>(partEnt.Comp.Body))
-        {
-            var newIntegrity = GetIntegrityThreshold(partEnt.Comp, integrity.Float(), severed);
-            // We need to check if the part is dead to prevent the UI from showing dead parts as alive.
-            if (targetPart is not null &&
-                targeting.BodyStatus.ContainsKey(targetPart.Value) &&
-                targeting.BodyStatus[targetPart.Value] != TargetIntegrity.Dead)
-            {
-                targeting.BodyStatus[targetPart.Value] = newIntegrity;
-                if (targetPart.Value == TargetBodyPart.Torso)
-                    targeting.BodyStatus[TargetBodyPart.Groin] = newIntegrity;
-
-                Dirty(partEnt.Comp.Body.Value, targeting);
-            }
-            // Revival events are handled by the server, so we end up being locked to a network event.
-            // I hope you like the _net.IsServer, Remuchi :)
-            if (_net.IsServer)
-                RaiseNetworkEvent(new TargetIntegrityChangeEvent(GetNetEntity(partEnt.Comp.Body.Value)), partEnt.Comp.Body.Value);
-        }
-    }
-
-    /// <summary>
-    /// Gets the integrity of all body parts in the entity.
-    /// </summary>
-    public Dictionary<TargetBodyPart, TargetIntegrity> GetBodyPartStatus(EntityUid entityUid)
-    {
-        var result = new Dictionary<TargetBodyPart, TargetIntegrity>();
-
-        if (!TryComp<BodyComponent>(entityUid, out var body))
-            return result;
-
-        foreach (var part in SharedTargetingSystem.GetValidParts())
-        {
-            result[part] = TargetIntegrity.Severed;
-        }
-
-        foreach (var partComponent in GetBodyChildren(entityUid, body))
-        {
-            var targetBodyPart = GetTargetBodyPart(partComponent.Component.PartType, partComponent.Component.Symmetry);
-
-            if (targetBodyPart != null && TryComp<DamageableComponent>(partComponent.Id, out var damageable))
-                result[targetBodyPart.Value] = GetIntegrityThreshold(partComponent.Component, damageable.TotalDamage.Float(), false);
-        }
-
-        // Hardcoded shitcode for Groin :)
-        result[TargetBodyPart.Groin] = result[TargetBodyPart.Torso];
-
-        return result;
-    }
-
-    public TargetBodyPart? GetTargetBodyPart(Entity<BodyPartComponent> part) => GetTargetBodyPart(part.Comp.PartType, part.Comp.Symmetry);
-    public TargetBodyPart? GetTargetBodyPart(BodyPartComponent part) => GetTargetBodyPart(part.PartType, part.Symmetry);
-    /// <summary>
-    /// Converts Enums from BodyPartType to their Targeting system equivalent.
-    /// </summary>
-    public TargetBodyPart? GetTargetBodyPart(BodyPartType type, BodyPartSymmetry symmetry)
-    {
-        return (type, symmetry) switch
-        {
-            (BodyPartType.Head, _) => TargetBodyPart.Head,
-            (BodyPartType.Torso, _) => TargetBodyPart.Torso,
-            (BodyPartType.Arm, BodyPartSymmetry.Left) => TargetBodyPart.LeftArm,
-            (BodyPartType.Arm, BodyPartSymmetry.Right) => TargetBodyPart.RightArm,
-            (BodyPartType.Hand, BodyPartSymmetry.Left) => TargetBodyPart.LeftHand,
-            (BodyPartType.Hand, BodyPartSymmetry.Right) => TargetBodyPart.RightHand,
-            (BodyPartType.Leg, BodyPartSymmetry.Left) => TargetBodyPart.LeftLeg,
-            (BodyPartType.Leg, BodyPartSymmetry.Right) => TargetBodyPart.RightLeg,
-            (BodyPartType.Foot, BodyPartSymmetry.Left) => TargetBodyPart.LeftFoot,
-            (BodyPartType.Foot, BodyPartSymmetry.Right) => TargetBodyPart.RightFoot,
-            _ => null
-        };
-    }
-
-    /// <summary>
-    /// Converts Enums from Targeting system to their BodyPartType equivalent.
-    /// </summary>
-    public (BodyPartType Type, BodyPartSymmetry Symmetry) ConvertTargetBodyPart(TargetBodyPart targetPart)
-    {
-        return targetPart switch
-        {
-            TargetBodyPart.Head => (BodyPartType.Head, BodyPartSymmetry.None),
-            TargetBodyPart.Torso => (BodyPartType.Torso, BodyPartSymmetry.None),
-            TargetBodyPart.Groin => (BodyPartType.Torso, BodyPartSymmetry.None), // TODO: Groin is not a part type yet
-            TargetBodyPart.LeftArm => (BodyPartType.Arm, BodyPartSymmetry.Left),
-            TargetBodyPart.LeftHand => (BodyPartType.Hand, BodyPartSymmetry.Left),
-            TargetBodyPart.RightArm => (BodyPartType.Arm, BodyPartSymmetry.Right),
-            TargetBodyPart.RightHand => (BodyPartType.Hand, BodyPartSymmetry.Right),
-            TargetBodyPart.LeftLeg => (BodyPartType.Leg, BodyPartSymmetry.Left),
-            TargetBodyPart.LeftFoot => (BodyPartType.Foot, BodyPartSymmetry.Left),
-            TargetBodyPart.RightLeg => (BodyPartType.Leg, BodyPartSymmetry.Right),
-            TargetBodyPart.RightFoot => (BodyPartType.Foot, BodyPartSymmetry.Right),
-            _ => (BodyPartType.Torso, BodyPartSymmetry.None)
-        };
-
-    }
-
-    /// <summary>
-    /// Fetches the damage multiplier for part integrity based on part types.
-    /// </summary>
-    /// TODO: Serialize this per body part.
-    public static float GetPartDamageModifier(BodyPartType partType)
-    {
-        return partType switch
-        {
-            BodyPartType.Head => 0.5f, // 50% damage, necks are hard to cut
-            BodyPartType.Torso => 1.0f, // 100% damage
-            BodyPartType.Arm => 0.7f, // 70% damage
-            BodyPartType.Hand => 0.7f, // 70% damage
-            BodyPartType.Leg => 0.7f, // 70% damage
-            BodyPartType.Foot => 0.7f, // 70% damage
-        };
-    }
-
-    /// <summary>
-    /// Fetches the TargetIntegrity equivalent of the current integrity value for the body part.
-    /// </summary>
-    public static TargetIntegrity GetIntegrityThreshold(BodyPartComponent component, float integrity, bool severed)
-    {
-        var enabled = component.Enabled;
-
-        if (severed)
-            return TargetIntegrity.Severed;
-        else if (!component.Enabled)
-            return TargetIntegrity.Disabled;
-
-        var targetIntegrity = TargetIntegrity.Healthy;
-        foreach (var threshold in component.IntegrityThresholds)
-        {
-            if (integrity <= threshold.Value)
-                targetIntegrity = threshold.Key;
-        }
-
-        return targetIntegrity;
-    }
-
-    /// <summary>
-    /// Fetches the chance to evade integrity damage for a body part.
-    /// Used when the entity is not dead, laying down, or incapacitated.
-    /// </summary>
-    public static float GetEvadeChance(BodyPartType partType)
-    {
-        return partType switch
-        {
-            BodyPartType.Head => 0.70f,  // 70% chance to evade
-            BodyPartType.Arm => 0.20f,   // 20% chance to evade
-            BodyPartType.Hand => 0.20f, // 20% chance to evade
-            BodyPartType.Leg => 0.20f,   // 20% chance to evade
-            BodyPartType.Foot => 0.20f, // 20% chance to evade
-            BodyPartType.Torso => 0f, // 0% chance to evade
-            _ => 0f
-        };
-    }
-
-    public bool CanEvadeDamage(Entity<MobStateComponent?> uid)
-    {
-        if (!Resolve(uid, ref uid.Comp))
-            return false;
-
-        return TryComp<StandingStateComponent>(uid, out var standingState)
-               && !_mobState.IsCritical(uid, uid)
-               && !_mobState.IsDead(uid, uid);
-    }
-
-    public bool TryEvadeDamage(Entity<MobStateComponent?> uid, float evadeChance)
-    {
-        if (!Resolve(uid, ref uid.Comp))
-            return false;
-
-        if (!CanEvadeDamage(uid))
-            return false;
-
-        return _random.NextFloat() < evadeChance;
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Subsystems/GenerateChildPartComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Subsystems/GenerateChildPartComponent.cs
deleted file mode 100644
index 0185f0aab7d..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Subsystems/GenerateChildPartComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Subsystems;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class GenerateChildPartComponent : Component
-{
-
-    [DataField(required: true)]
-    public EntProtoId Id = "";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? ChildPart;
-
-    [DataField]
-    public bool Active = false;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Subsystems/GenerateChildPartSystem.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Subsystems/GenerateChildPartSystem.cs
deleted file mode 100644
index 7e3cc55b23d..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Body/Subsystems/GenerateChildPartSystem.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Timing;
-using Robust.Shared.Network;
-using System.Numerics;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
-
-namespace Content.Shared._CorvaxNext.Surgery.Body.Subsystems;
-
-public sealed class GenerateChildPartSystem : EntitySystem
-{
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly INetManager _net = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<GenerateChildPartComponent, BodyPartComponentsModifyEvent>(OnPartComponentsModify);
-    }
-
-    private void OnPartComponentsModify(EntityUid uid, GenerateChildPartComponent component, ref BodyPartComponentsModifyEvent args)
-    {
-        if (args.Add)
-            CreatePart(uid, component);
-        //else
-            //DeletePart(uid, component);
-    }
-
-    private void CreatePart(EntityUid uid, GenerateChildPartComponent component)
-    {
-        if (!TryComp(uid, out BodyPartComponent? partComp)
-            || partComp.Body is null
-            || component.Active)
-            return;
-
-        // I pinky swear to also move this to the server side properly next update :)
-        if (_net.IsServer)
-        {
-            var childPart = Spawn(component.Id, new EntityCoordinates(partComp.Body.Value, Vector2.Zero));
-
-            if (!TryComp(childPart, out BodyPartComponent? childPartComp))
-                return;
-
-            var slotName = _bodySystem.GetSlotFromBodyPart(childPartComp);
-            _bodySystem.TryCreatePartSlot(uid, slotName, childPartComp.PartType, out var _);
-            _bodySystem.AttachPart(uid, slotName, childPart, partComp, childPartComp);
-            component.ChildPart = childPart;
-            component.Active = true;
-            Dirty(childPart, childPartComp);
-        }
-    }
-
-    // Still unusued, gotta figure out what I want to do with this function outside of fuckery with mantis blades.
-    private void DeletePart(EntityUid uid, GenerateChildPartComponent component)
-    {
-        if (!TryComp(uid, out BodyPartComponent? partComp))
-            return;
-
-        _bodySystem.DropSlotContents((uid, partComp));
-        var ev = new BodyPartDroppedEvent((uid, partComp));
-        RaiseLocalEvent(uid, ref ev);
-        QueueDel(uid);
-    }
-}
-
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs
deleted file mode 100644
index bab7e405ad5..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryCloseIncisionConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryComponentConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryComponentConditionComponent.cs
deleted file mode 100644
index 621ce43108a..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryComponentConditionComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
-
-// Quite the redundant name eh?
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryComponentConditionComponent : Component
-{
-    [DataField]
-    public ComponentRegistry Component;
-
-    [DataField]
-    public bool Inverse;
-
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryLarvaConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryLarvaConditionComponent.cs
deleted file mode 100644
index 3aac5951c6f..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryLarvaConditionComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryLarvaConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryMarkingConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryMarkingConditionComponent.cs
deleted file mode 100644
index f22b1f682e2..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryMarkingConditionComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Body.Organ;
-using Content.Shared.Humanoid;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryMarkingConditionComponent : Component
-{
-
-    [DataField]
-    public bool Inverse;
-
-    /// <summary>
-    ///     The marking category to check for.
-    /// </summary>
-    [DataField]
-    public HumanoidVisualLayers MarkingCategory = default!;
-
-    /// <summary>
-    ///     Can be either a segment of a marking ID, or an entire ID that will be checked
-    ///     against the entity to validate that the marking is not already present.
-    /// </summary>
-    [DataField]
-    public String MatchString = "";
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs
deleted file mode 100644
index 0c43549e669..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryOperatingTableConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOrganConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOrganConditionComponent.cs
deleted file mode 100644
index c8c475f115a..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOrganConditionComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Body.Organ;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryOrganConditionComponent : Component
-{
-    [DataField]
-    public ComponentRegistry? Organ;
-
-    [DataField]
-    public bool Inverse;
-
-    [DataField]
-    public bool Reattaching;
-}
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartConditionComponent.cs
deleted file mode 100644
index 08a89eb9e1b..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartConditionComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryPartConditionComponent : Component
-{
-    [DataField]
-    public BodyPartType Part;
-
-    [DataField]
-    public BodyPartSymmetry? Symmetry;
-
-    [DataField]
-    public bool Inverse;
-}
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartPresentCondition.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartPresentCondition.cs
deleted file mode 100644
index 608f90ba4cb..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartPresentCondition.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryPartPresentConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs
deleted file mode 100644
index 1ad5025480b..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryPartRemovedConditionComponent : Component
-{
-    /// <summary>
-    ///     Requires that the parent part can attach a new part to this slot.
-    /// </summary>
-    [DataField(required: true)]
-    public string Connection = string.Empty;
-
-    [DataField]
-    public BodyPartType Part;
-
-    [DataField]
-    public BodyPartSymmetry? Symmetry;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryValidEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryValidEvent.cs
deleted file mode 100644
index da769a457ac..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryValidEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Body.Part;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-/// <summary>
-///     Raised on the entity that is receiving surgery.
-/// </summary>
-[ByRefEvent]
-public record struct SurgeryValidEvent(EntityUid Body, EntityUid Part, bool Cancelled = false, BodyPartType PartType = default, BodyPartSymmetry? Symmetry = default);
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryWoundedConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryWoundedConditionComponent.cs
deleted file mode 100644
index 2279fcd0440..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryWoundedConditionComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryWoundedConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryCompletedEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryCompletedEvent.cs
deleted file mode 100644
index a0e040fbe7a..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryCompletedEvent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Medical.Surgery.Effects.Complete;
-
-/// <summary>
-///     Raised on the entity that received the surgery.
-/// </summary>
-[ByRefEvent]
-public record struct SurgeryCompletedEvent;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs
deleted file mode 100644
index 2077dfa53b8..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Effects.Complete;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRemoveLarvaComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs
deleted file mode 100644
index 4752d169a18..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryDamageChangeEffectComponent : Component
-{
-    [DataField]
-    public DamageSpecifier Damage = default!;
-
-    [DataField]
-    public float SleepModifier = 0.5f;
-
-    [DataField]
-    public bool IsConsumable;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs
deleted file mode 100644
index e375865277f..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-namespace Content.Shared.Medical.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgerySpecialDamageChangeEffectComponent : Component
-{
-    [DataField]
-    public string DamageType = "";
-
-    [DataField]
-    public bool IsConsumable;
-}
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs
deleted file mode 100644
index 8a4f5aa2ace..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryStepCavityEffectComponent : Component
-{
-    [DataField]
-    public string Action = "Insert";
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs
deleted file mode 100644
index 6f7f7fefe46..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Chat.Prototypes;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class SurgeryStepEmoteEffectComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public ProtoId<EmotePrototype> Emote = "Scream";
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs
deleted file mode 100644
index 138a506739a..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Shared.Chat.Prototypes;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using System.ComponentModel.DataAnnotations;
-
-namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class SurgeryStepSpawnEffectComponent : Component
-{
-    [DataField(required: true), AutoNetworkedField]
-    public EntProtoId Entity;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs
deleted file mode 100644
index b3775fb8afb..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class SurgeryTendWoundsEffectComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public string MainGroup = "Brute";
-
-    [DataField, AutoNetworkedField]
-    public bool IsAutoRepeatable = true;
-
-    [DataField, AutoNetworkedField]
-    public DamageSpecifier Damage = default!;
-
-    [DataField, AutoNetworkedField]
-    public float HealMultiplier = 0.07f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/OperatingTableComponent.cs b/Content.Shared/_CorvaxNext/Surgery/OperatingTableComponent.cs
deleted file mode 100644
index 39546749fff..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/OperatingTableComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class OperatingTableComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/SanitizedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/SanitizedComponent.cs
deleted file mode 100644
index 8731afc7b9a..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SanitizedComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-/// <summary>
-///     Prevents the entity from causing toxin damage to entities it does surgery on.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SanitizedComponent : Component { }
diff --git a/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.Steps.cs
deleted file mode 100644
index f6929c116e1..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.Steps.cs
+++ /dev/null
@@ -1,829 +0,0 @@
-using Content.Shared.Medical.Surgery.Conditions;
-using Content.Shared.Medical.Surgery.Steps;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Organ;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.DoAfter;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Inventory;
-using Content.Shared.Item;
-using Content.Shared.Popups;
-using Robust.Shared.Prototypes;
-using System.Linq;
-using Content.Shared._CorvaxNext.Surgery;
-using Content.Shared._CorvaxNext.Mood;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
-using Content.Shared._CorvaxNext.Surgery.Body.Organs;
-using Content.Shared._CorvaxNext.Surgery.Effects.Step;
-using Content.Shared._CorvaxNext.Surgery.Steps;
-using Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-using Content.Shared._CorvaxNext.Surgery.Tools;
-using Content.Shared.Containers.ItemSlots;
-using AmputateAttemptEvent = Content.Shared.Body.Events.AmputateAttemptEvent;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-public abstract partial class SharedSurgerySystem
-{
-    private static readonly string[] BruteDamageTypes = { "Slash", "Blunt", "Piercing" };
-    private static readonly string[] BurnDamageTypes = { "Heat", "Shock", "Cold", "Caustic" };
-    private void InitializeSteps()
-    {
-        SubscribeLocalEvent<SurgeryStepComponent, SurgeryStepEvent>(OnToolStep);
-        SubscribeLocalEvent<SurgeryStepComponent, SurgeryStepCompleteCheckEvent>(OnToolCheck);
-        SubscribeLocalEvent<SurgeryStepComponent, SurgeryCanPerformStepEvent>(OnToolCanPerform);
-
-        //SubSurgery<SurgeryCutLarvaRootsStepComponent>(OnCutLarvaRootsStep, OnCutLarvaRootsCheck);
-
-        /*  Abandon all hope ye who enter here. Now I am become shitcoder, the bloater of files.
-            On a serious note, I really hate how much bloat this pattern of subscribing to a StepEvent and a CheckEvent
-            creates in terms of readability. And while Check DOES only run on the server side, it's still annoying to parse through.*/
-
-        SubSurgery<SurgeryTendWoundsEffectComponent>(OnTendWoundsStep, OnTendWoundsCheck);
-        SubSurgery<SurgeryStepCavityEffectComponent>(OnCavityStep, OnCavityCheck);
-        SubSurgery<SurgeryAddPartStepComponent>(OnAddPartStep, OnAddPartCheck);
-        SubSurgery<SurgeryAffixPartStepComponent>(OnAffixPartStep, OnAffixPartCheck);
-        SubSurgery<SurgeryRemovePartStepComponent>(OnRemovePartStep, OnRemovePartCheck);
-        SubSurgery<SurgeryAddOrganStepComponent>(OnAddOrganStep, OnAddOrganCheck);
-        SubSurgery<SurgeryRemoveOrganStepComponent>(OnRemoveOrganStep, OnRemoveOrganCheck);
-        SubSurgery<SurgeryAffixOrganStepComponent>(OnAffixOrganStep, OnAffixOrganCheck);
-        SubSurgery<SurgeryAddMarkingStepComponent>(OnAddMarkingStep, OnAddMarkingCheck);
-        SubSurgery<SurgeryRemoveMarkingStepComponent>(OnRemoveMarkingStep, OnRemoveMarkingCheck);
-        Subs.BuiEvents<SurgeryTargetComponent>(SurgeryUIKey.Key, subs =>
-        {
-            subs.Event<SurgeryStepChosenBuiMsg>(OnSurgeryTargetStepChosen);
-        });
-    }
-
-    private void SubSurgery<TComp>(EntityEventRefHandler<TComp, SurgeryStepEvent> onStep,
-        EntityEventRefHandler<TComp, SurgeryStepCompleteCheckEvent> onComplete) where TComp : IComponent
-    {
-        SubscribeLocalEvent(onStep);
-        SubscribeLocalEvent(onComplete);
-    }
-
-    private void OnToolStep(Entity<SurgeryStepComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (ent.Comp.Tool != null)
-        {
-            foreach (var reg in ent.Comp.Tool.Values)
-            {
-                if (!AnyHaveComp(args.Tools, reg.Component, out var tool, out _))
-                    return;
-
-                if (_net.IsServer &&
-                    TryComp(tool, out SurgeryToolComponent? toolComp) &&
-                    toolComp.EndSound != null)
-                {
-                    _audio.PlayEntity(toolComp.EndSound, args.User, tool);
-                }
-            }
-        }
-
-        if (ent.Comp.Add != null)
-        {
-            foreach (var reg in ent.Comp.Add.Values)
-            {
-                var compType = reg.Component.GetType();
-                if (HasComp(args.Part, compType))
-                    continue;
-                AddComp(args.Part, _compFactory.GetComponent(compType));
-            }
-        }
-
-        if (ent.Comp.Remove != null)
-        {
-            foreach (var reg in ent.Comp.Remove.Values)
-            {
-                RemComp(args.Part, reg.Component.GetType());
-            }
-        }
-
-        if (ent.Comp.BodyAdd != null)
-        {
-            foreach (var reg in ent.Comp.BodyAdd.Values)
-            {
-                var compType = reg.Component.GetType();
-                if (HasComp(args.Body, compType))
-                    continue;
-                AddComp(args.Body, _compFactory.GetComponent(compType));
-            }
-        }
-
-        if (ent.Comp.BodyRemove != null)
-        {
-            foreach (var reg in ent.Comp.BodyRemove.Values)
-            {
-                RemComp(args.Body, reg.Component.GetType());
-            }
-        }
-
-        if (!HasComp<ForcedSleepingComponent>(args.Body))
-            RaiseLocalEvent(args.Body, new MoodEffectEvent("SurgeryPain"));
-
-        if (!_inventory.TryGetSlotEntity(args.User, "gloves", out var _)
-            || !_inventory.TryGetSlotEntity(args.User, "mask", out var _))
-        {
-            if (!HasComp<SanitizedComponent>(args.User))
-            {
-                var sepsis = new DamageSpecifier(_prototypes.Index<DamageTypePrototype>("Poison"), 5);
-                var ev = new SurgeryStepDamageEvent(args.User, args.Body, args.Part, args.Surgery, sepsis, 0.5f);
-                RaiseLocalEvent(args.Body, ref ev);
-            }
-        }
-    }
-
-    private void OnToolCheck(Entity<SurgeryStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        // Lord this function is fucking bloated now. Need to clean it up so its less spammy.
-        if (ent.Comp.Add != null)
-        {
-            foreach (var reg in ent.Comp.Add.Values)
-            {
-                if (!HasComp(args.Part, reg.Component.GetType()))
-                {
-                    args.Cancelled = true;
-                    return;
-                }
-            }
-        }
-
-        if (ent.Comp.Remove != null)
-        {
-            foreach (var reg in ent.Comp.Remove.Values)
-            {
-                if (HasComp(args.Part, reg.Component.GetType()))
-                {
-                    args.Cancelled = true;
-                    return;
-                }
-            }
-        }
-
-        if (ent.Comp.BodyAdd != null)
-        {
-            foreach (var reg in ent.Comp.BodyAdd.Values)
-            {
-                if (!HasComp(args.Body, reg.Component.GetType()))
-                {
-                    args.Cancelled = true;
-                    return;
-                }
-            }
-        }
-
-        if (ent.Comp.BodyRemove != null)
-        {
-            foreach (var reg in ent.Comp.BodyRemove.Values)
-            {
-                if (HasComp(args.Body, reg.Component.GetType()))
-                {
-                    args.Cancelled = true;
-                    return;
-                }
-            }
-        }
-    }
-
-    private void OnToolCanPerform(Entity<SurgeryStepComponent> ent, ref SurgeryCanPerformStepEvent args)
-    {
-        if (HasComp<SurgeryOperatingTableConditionComponent>(ent))
-        {
-            if (!TryComp(args.Body, out BuckleComponent? buckle) ||
-                !HasComp<OperatingTableComponent>(buckle.BuckledTo))
-            {
-                args.Invalid = StepInvalidReason.NeedsOperatingTable;
-                return;
-            }
-        }
-
-        if (_inventory.TryGetContainerSlotEnumerator(args.Body, out var containerSlotEnumerator, args.TargetSlots))
-        {
-            while (containerSlotEnumerator.MoveNext(out var containerSlot))
-            {
-                if (!containerSlot.ContainedEntity.HasValue)
-                    continue;
-
-                args.Invalid = StepInvalidReason.Armor;
-                args.Popup = Loc.GetString("surgery-ui-window-steps-error-armor");
-                return;
-            }
-        }
-
-        RaiseLocalEvent(args.Body, ref args);
-
-        if (args.Invalid != StepInvalidReason.None)
-            return;
-
-        if (ent.Comp.Tool != null)
-        {
-            args.ValidTools ??= new Dictionary<EntityUid, float>();
-
-            foreach (var reg in ent.Comp.Tool.Values)
-            {
-                if (!AnyHaveComp(args.Tools, reg.Component, out var tool, out var speed))
-                {
-                    args.Invalid = StepInvalidReason.MissingTool;
-
-                    if (reg.Component is ISurgeryToolComponent required)
-                        args.Popup = $"You need {required.ToolName} to perform this step!";
-
-                    return;
-                }
-
-                args.ValidTools[tool] = speed;
-            }
-        }
-    }
-
-    private EntProtoId? GetProtoId(EntityUid entityUid)
-    {
-        if (!TryComp<MetaDataComponent>(entityUid, out var metaData))
-            return null;
-
-        return metaData.EntityPrototype?.ID;
-    }
-
-    // I wonder if theres not a function that can do this already.
-    private bool HasDamageGroup(EntityUid entity, string[] group, out DamageableComponent? damageable)
-    {
-        if (!TryComp<DamageableComponent>(entity, out var damageableComp))
-        {
-            damageable = null;
-            return false;
-        }
-
-        damageable = damageableComp;
-        return group.Any(damageType => damageableComp.Damage.DamageDict.TryGetValue(damageType, out var value) && value > 0);
-
-    }
-
-    private void OnTendWoundsStep(Entity<SurgeryTendWoundsEffectComponent> ent, ref SurgeryStepEvent args)
-    {
-        var group = ent.Comp.MainGroup == "Brute" ? BruteDamageTypes : BurnDamageTypes;
-
-        if (!HasDamageGroup(args.Body, group, out var damageable)
-            && !HasDamageGroup(args.Part, group, out var _)
-            || damageable == null) // This shouldnt be possible but the compiler doesn't shut up.
-            return;
-
-
-        // Right now the bonus is based off the body's total damage, maybe we could make it based off each part in the future.
-        var bonus = ent.Comp.HealMultiplier * damageable.DamagePerGroup[ent.Comp.MainGroup];
-        if (_mobState.IsDead(args.Body))
-            bonus *= 0.2;
-
-        var adjustedDamage = new DamageSpecifier(ent.Comp.Damage);
-
-        foreach (var type in group)
-            adjustedDamage.DamageDict[type] -= bonus;
-
-        var ev = new SurgeryStepDamageEvent(args.User, args.Body, args.Part, args.Surgery, adjustedDamage, 0.5f);
-        RaiseLocalEvent(args.Body, ref ev);
-    }
-
-    private void OnTendWoundsCheck(Entity<SurgeryTendWoundsEffectComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        var group = ent.Comp.MainGroup == "Brute" ? BruteDamageTypes : BurnDamageTypes;
-
-        if (HasDamageGroup(args.Body, group, out var _)
-            || HasDamageGroup(args.Part, group, out var _))
-            args.Cancelled = true;
-    }
-
-    /*private void OnCutLarvaRootsStep(Entity<SurgeryCutLarvaRootsStepComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (TryComp(args.Body, out VictimInfectedComponent? infected) &&
-            infected.BurstAt > _timing.CurTime &&
-            infected.SpawnedLarva == null)
-        {
-            infected.RootsCut = true;
-        }
-    }
-
-    private void OnCutLarvaRootsCheck(Entity<SurgeryCutLarvaRootsStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        if (!TryComp(args.Body, out VictimInfectedComponent? infected) || !infected.RootsCut)
-            args.Cancelled = true;
-
-        // The larva has fully developed and surgery is now impossible
-        // TODO: Surgery should still be possible, but the fully developed larva should escape while also saving the hosts life
-        if (infected != null && infected.SpawnedLarva != null)
-            args.Cancelled = true;
-    }*/
-
-    private void OnCavityStep(Entity<SurgeryStepCavityEffectComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!TryComp(args.Part, out BodyPartComponent? partComp) || partComp.PartType != BodyPartType.Torso)
-            return;
-
-        var activeHandEntity = _hands.EnumerateHeld(args.User).FirstOrDefault();
-        if (activeHandEntity != default
-            && ent.Comp.Action == "Insert"
-            && TryComp(activeHandEntity, out ItemComponent? itemComp)
-            && (itemComp.Size.Id == "Tiny"
-            || itemComp.Size.Id == "Small"))
-            _itemSlotsSystem.TryInsert(ent, partComp.ItemInsertionSlot, activeHandEntity, args.User);
-        else if (ent.Comp.Action == "Remove")
-            _itemSlotsSystem.TryEjectToHands(ent, partComp.ItemInsertionSlot, args.User);
-    }
-
-    private void OnCavityCheck(Entity<SurgeryStepCavityEffectComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        // Normally this check would simply be partComp.ItemInsertionSlot.HasItem, but as mentioned before,
-        // For whatever reason it's not instantiating the field on the clientside after the wizmerge.
-        if (!TryComp(args.Part, out BodyPartComponent? partComp)
-            || !TryComp(args.Part, out ItemSlotsComponent? itemComp)
-            || ent.Comp.Action == "Insert"
-            && !itemComp.Slots[partComp.ContainerName].HasItem
-            || ent.Comp.Action == "Remove"
-            && itemComp.Slots[partComp.ContainerName].HasItem)
-            args.Cancelled = true;
-    }
-
-    private void OnAddPartStep(Entity<SurgeryAddPartStepComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!TryComp(args.Surgery, out SurgeryPartRemovedConditionComponent? removedComp))
-            return;
-
-        foreach (var tool in args.Tools)
-        {
-            if (TryComp(tool, out BodyPartComponent? partComp)
-                && partComp.PartType == removedComp.Part
-                && (removedComp.Symmetry == null || partComp.Symmetry == removedComp.Symmetry))
-            {
-                var slotName = removedComp.Symmetry != null
-                    ? $"{removedComp.Symmetry?.ToString().ToLower()} {removedComp.Part.ToString().ToLower()}"
-                    : removedComp.Part.ToString().ToLower();
-                _body.TryCreatePartSlot(args.Part, slotName, partComp.PartType, out _);
-                _body.AttachPart(args.Part, slotName, tool);
-                EnsureComp<BodyPartReattachedComponent>(tool);
-                var ev = new BodyPartAttachedEvent((tool, partComp));
-                RaiseLocalEvent(args.Body, ref ev);
-            }
-        }
-    }
-
-    private void OnAffixPartStep(Entity<SurgeryAffixPartStepComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!TryComp(args.Surgery, out SurgeryPartRemovedConditionComponent? removedComp))
-            return;
-
-        var targetPart = _body.GetBodyChildrenOfType(args.Body, removedComp.Part, symmetry: removedComp.Symmetry).FirstOrDefault();
-
-        if (targetPart != default)
-        {
-            // We reward players for properly affixing the parts by healing a little bit of damage, and enabling the part temporarily.
-            var ev = new BodyPartEnableChangedEvent(true);
-            RaiseLocalEvent(targetPart.Id, ref ev);
-            _damageable.TryChangeDamage(args.Body,
-                _body.GetHealingSpecifier(targetPart.Component) * 2,
-                canSever: false, // Just in case we heal a brute damage specifier and the logic gets fucky lol
-                targetPart: _body.GetTargetBodyPart(targetPart.Component.PartType, targetPart.Component.Symmetry));
-            RemComp<BodyPartReattachedComponent>(targetPart.Id);
-        }
-    }
-
-    private void OnAffixPartCheck(Entity<SurgeryAffixPartStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        if (!TryComp(args.Surgery, out SurgeryPartRemovedConditionComponent? removedComp))
-            return;
-
-        var targetPart = _body.GetBodyChildrenOfType(args.Body, removedComp.Part, symmetry: removedComp.Symmetry).FirstOrDefault();
-
-        if (targetPart != default
-            && HasComp<BodyPartReattachedComponent>(targetPart.Id))
-            args.Cancelled = true;
-    }
-
-    private void OnAddPartCheck(Entity<SurgeryAddPartStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        if (!TryComp(args.Surgery, out SurgeryPartRemovedConditionComponent? removedComp)
-            || !_body.GetBodyChildrenOfType(args.Body, removedComp.Part, symmetry: removedComp.Symmetry).Any())
-            args.Cancelled = true;
-    }
-
-    private void OnRemovePartStep(Entity<SurgeryRemovePartStepComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!TryComp(args.Part, out BodyPartComponent? partComp)
-            || partComp.Body != args.Body)
-            return;
-
-        var ev = new AmputateAttemptEvent(args.Part);
-        RaiseLocalEvent(args.Part, ref ev);
-        _hands.TryPickupAnyHand(args.User, args.Part);
-    }
-
-    private void OnRemovePartCheck(Entity<SurgeryRemovePartStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        if (!TryComp(args.Part, out BodyPartComponent? partComp)
-            || partComp.Body == args.Body)
-            args.Cancelled = true;
-    }
-
-    private void OnAddOrganStep(Entity<SurgeryAddOrganStepComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!TryComp(args.Part, out BodyPartComponent? partComp)
-            || partComp.Body != args.Body
-            || !TryComp(args.Surgery, out SurgeryOrganConditionComponent? organComp)
-            || organComp.Organ == null)
-            return;
-
-        // Adding organs is generally done for a single one at a time, so we only need to check for the first.
-        var firstOrgan = organComp.Organ.Values.FirstOrDefault();
-        if (firstOrgan == default)
-            return;
-
-        foreach (var tool in args.Tools)
-        {
-            if (HasComp(tool, firstOrgan.Component.GetType())
-                && TryComp<OrganComponent>(tool, out var insertedOrgan)
-                && _body.InsertOrgan(args.Part, tool, insertedOrgan.SlotId, partComp, insertedOrgan))
-            {
-                EnsureComp<OrganReattachedComponent>(tool);
-                if (_body.TrySetOrganUsed(tool, true, insertedOrgan)
-                    && insertedOrgan.OriginalBody != args.Body)
-                {
-                    var ev = new SurgeryStepDamageChangeEvent(args.User, args.Body, args.Part, ent);
-                    RaiseLocalEvent(ent, ref ev);
-                }
-                break;
-            }
-        }
-    }
-
-    private void OnAddOrganCheck(Entity<SurgeryAddOrganStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        if (!TryComp<SurgeryOrganConditionComponent>(args.Surgery, out var organComp)
-            || organComp.Organ is null
-            || !TryComp(args.Part, out BodyPartComponent? partComp)
-            || partComp.Body != args.Body)
-            return;
-
-        // For now we naively assume that every entity will only have one of each organ type.
-        // that we do surgery on, but in the future we'll need to reference their prototype somehow
-        // to know if they need 2 hearts, 2 lungs, etc.
-        foreach (var reg in organComp.Organ.Values)
-        {
-            if (!_body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var _))
-            {
-                args.Cancelled = true;
-            }
-        }
-    }
-
-    private void OnAffixOrganStep(Entity<SurgeryAffixOrganStepComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!TryComp(args.Surgery, out SurgeryOrganConditionComponent? removedOrganComp)
-            || removedOrganComp.Organ == null
-            || !removedOrganComp.Reattaching)
-            return;
-
-        foreach (var reg in removedOrganComp.Organ.Values)
-        {
-            _body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs);
-            if (organs != null && organs.Count > 0)
-                RemComp<OrganReattachedComponent>(organs[0].Id);
-        }
-
-    }
-
-    private void OnAffixOrganCheck(Entity<SurgeryAffixOrganStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        if (!TryComp(args.Surgery, out SurgeryOrganConditionComponent? removedOrganComp)
-            || removedOrganComp.Organ == null
-            || !removedOrganComp.Reattaching)
-            return;
-
-        foreach (var reg in removedOrganComp.Organ.Values)
-        {
-            _body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs);
-            if (organs != null
-                && organs.Count > 0
-                && organs.Any(organ => HasComp<OrganReattachedComponent>(organ.Id)))
-                args.Cancelled = true;
-        }
-    }
-
-    private void OnRemoveOrganStep(Entity<SurgeryRemoveOrganStepComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!TryComp<SurgeryOrganConditionComponent>(args.Surgery, out var organComp)
-            || organComp.Organ == null)
-            return;
-
-        foreach (var reg in organComp.Organ.Values)
-        {
-            _body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs);
-            if (organs != null && organs.Count > 0)
-            {
-                _body.RemoveOrgan(organs[0].Id, organs[0].Organ);
-                _hands.TryPickupAnyHand(args.User, organs[0].Id);
-            }
-        }
-    }
-
-    private void OnRemoveOrganCheck(Entity<SurgeryRemoveOrganStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        if (!TryComp<SurgeryOrganConditionComponent>(args.Surgery, out var organComp)
-            || organComp.Organ == null
-            || !TryComp(args.Part, out BodyPartComponent? partComp)
-            || partComp.Body != args.Body)
-            return;
-
-        foreach (var reg in organComp.Organ.Values)
-        {
-            if (_body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs)
-                && organs != null
-                && organs.Count > 0)
-            {
-                args.Cancelled = true;
-                return;
-            }
-        }
-    }
-
-    // TODO: Refactor bodies to include ears as a prototype instead of doing whatever the hell this is.
-    private void OnAddMarkingStep(Entity<SurgeryAddMarkingStepComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!TryComp(args.Body, out HumanoidAppearanceComponent? bodyAppearance)
-            || ent.Comp.Organ == null)
-            return;
-
-        var organType = ent.Comp.Organ.Values.FirstOrDefault();
-        if (organType == default)
-            return;
-
-        var markingCategory = MarkingCategoriesConversion.FromHumanoidVisualLayers(ent.Comp.MarkingCategory);
-        foreach (var tool in args.Tools)
-        {
-            if (TryComp(tool, out MarkingContainerComponent? markingComp)
-                && HasComp(tool, organType.Component.GetType()))
-            {
-                if (!bodyAppearance.MarkingSet.Markings.TryGetValue(markingCategory, out var markingList)
-                    || !markingList.Any(marking => marking.MarkingId.Contains(ent.Comp.MatchString)))
-                {
-                    EnsureComp<BodyPartAppearanceComponent>(args.Part);
-                    _body.ModifyMarkings(args.Body, args.Part, bodyAppearance, ent.Comp.MarkingCategory, markingComp.Marking);
-
-                    if (ent.Comp.Accent != null
-                        && ent.Comp.Accent.Values.FirstOrDefault() is { } accent)
-                    {
-                        var compType = accent.Component.GetType();
-                        if (!HasComp(args.Body, compType))
-                            AddComp(args.Body, _compFactory.GetComponent(compType));
-                    }
-
-                    QueueDel(tool); // Again since this isnt actually being inserted we just delete it lol.
-                }
-            }
-        }
-
-    }
-
-    private void OnAddMarkingCheck(Entity<SurgeryAddMarkingStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-        var markingCategory = MarkingCategoriesConversion.FromHumanoidVisualLayers(ent.Comp.MarkingCategory);
-
-        if (!TryComp(args.Body, out HumanoidAppearanceComponent? bodyAppearance)
-            || !bodyAppearance.MarkingSet.Markings.TryGetValue(markingCategory, out var markingList)
-            || !markingList.Any(marking => marking.MarkingId.Contains(ent.Comp.MatchString)))
-            args.Cancelled = true;
-    }
-
-    private void OnRemoveMarkingStep(Entity<SurgeryRemoveMarkingStepComponent> ent, ref SurgeryStepEvent args)
-    {
-
-    }
-
-    private void OnRemoveMarkingCheck(Entity<SurgeryRemoveMarkingStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
-    {
-
-    }
-
-    private void OnSurgeryTargetStepChosen(Entity<SurgeryTargetComponent> ent, ref SurgeryStepChosenBuiMsg args)
-    {
-        var user = args.Actor;
-        if (GetEntity(args.Entity) is not { Valid: true } body ||
-            GetEntity(args.Part) is not { Valid: true } targetPart ||
-            !IsSurgeryValid(body, targetPart, args.Surgery, args.Step, user, out var surgery, out var part, out var step))
-        {
-            return;
-        }
-
-        if (!PreviousStepsComplete(body, part, surgery, args.Step) ||
-            IsStepComplete(body, part, args.Step, surgery))
-            return;
-
-        if (!CanPerformStep(user, body, part, step, true, out _, out _, out var validTools))
-            return;
-
-        var speed = 1f;
-        var usedEv = new SurgeryToolUsedEvent(user, body);
-        // We need to check for nullability because of surgeries that dont require a tool, like Cavity Implants
-        if (validTools?.Count > 0)
-        {
-            foreach (var (tool, toolSpeed) in validTools)
-            {
-                RaiseLocalEvent(tool, ref usedEv);
-                if (usedEv.Cancelled)
-                    return;
-
-                speed *= toolSpeed;
-            }
-
-            if (_net.IsServer)
-            {
-                foreach (var tool in validTools.Keys)
-                {
-                    if (TryComp(tool, out SurgeryToolComponent? toolComp) &&
-                        toolComp.EndSound != null)
-                    {
-                        _audio.PlayEntity(toolComp.StartSound, user, tool);
-                    }
-                }
-            }
-        }
-
-        if (TryComp(body, out TransformComponent? xform))
-            _rotateToFace.TryFaceCoordinates(user, _transform.GetMapCoordinates(body, xform).Position);
-
-        var ev = new SurgeryDoAfterEvent(args.Surgery, args.Step);
-        // TODO: Move 2 seconds to a field of SurgeryStepComponent
-        var duration = 2f / speed;
-        if (TryComp(user, out SurgerySpeedModifierComponent? surgerySpeedMod)
-            && surgerySpeedMod is not null)
-            duration = duration / surgerySpeedMod.SpeedModifier;
-
-        var doAfter = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(duration), ev, body, part)
-        {
-            BreakOnMove = true,
-            CancelDuplicate = true,
-            DuplicateCondition = DuplicateConditions.SameEvent,
-            NeedHand = true,
-            BreakOnHandChange = true,
-        };
-
-        if (_doAfter.TryStartDoAfter(doAfter))
-        {
-            var userName = Identity.Entity(user, EntityManager);
-            var targetName = Identity.Entity(ent.Owner, EntityManager);
-
-            var locName = $"surgery-popup-procedure-{args.Surgery}-step-{args.Step}";
-            var locResult = Loc.GetString(locName,
-                ("user", userName), ("target", targetName), ("part", part));
-
-            if (locResult == locName)
-                locResult = Loc.GetString($"surgery-popup-step-{args.Step}",
-                    ("user", userName), ("target", targetName), ("part", part));
-
-            _popup.PopupEntity(locResult, user);
-        }
-    }
-
-    private float GetSurgeryDuration(EntityUid surgeryStep, EntityUid user, EntityUid target, float toolSpeed)
-    {
-        if (!TryComp(surgeryStep, out SurgeryStepComponent? stepComp))
-            return 2f; // Shouldnt really happen but just a failsafe.
-
-        var speed = toolSpeed;
-
-        if (TryComp(user, out SurgerySpeedModifierComponent? surgerySpeedMod))
-            speed *= surgerySpeedMod.SpeedModifier;
-
-        return stepComp.Duration / speed;
-    }
-    private (Entity<SurgeryComponent> Surgery, int Step)? GetNextStep(EntityUid body, EntityUid part, Entity<SurgeryComponent?> surgery, List<EntityUid> requirements)
-    {
-        if (!Resolve(surgery, ref surgery.Comp))
-            return null;
-
-        if (requirements.Contains(surgery))
-            throw new ArgumentException($"Surgery {surgery} has a requirement loop: {string.Join(", ", requirements)}");
-
-        requirements.Add(surgery);
-
-        if (surgery.Comp.Requirement is { } requirementId &&
-            GetSingleton(requirementId) is { } requirement &&
-            GetNextStep(body, part, requirement, requirements) is { } requiredNext)
-        {
-            return requiredNext;
-        }
-
-        for (var i = 0; i < surgery.Comp.Steps.Count; i++)
-        {
-            var surgeryStep = surgery.Comp.Steps[i];
-            if (!IsStepComplete(body, part, surgeryStep, surgery))
-                return ((surgery, surgery.Comp), i);
-        }
-
-        return null;
-    }
-
-    public (Entity<SurgeryComponent> Surgery, int Step)? GetNextStep(EntityUid body, EntityUid part, EntityUid surgery)
-    {
-        return GetNextStep(body, part, surgery, new List<EntityUid>());
-    }
-
-    public bool PreviousStepsComplete(EntityUid body, EntityUid part, Entity<SurgeryComponent> surgery, EntProtoId step)
-    {
-        // TODO RMC14 use index instead of the prototype id
-        if (surgery.Comp.Requirement is { } requirement)
-        {
-            if (GetSingleton(requirement) is not { } requiredEnt ||
-                !TryComp(requiredEnt, out SurgeryComponent? requiredComp) ||
-                !PreviousStepsComplete(body, part, (requiredEnt, requiredComp), step))
-            {
-                return false;
-            }
-        }
-
-        foreach (var surgeryStep in surgery.Comp.Steps)
-        {
-            if (surgeryStep == step)
-                break;
-
-            if (!IsStepComplete(body, part, surgeryStep, surgery))
-                return false;
-        }
-
-        return true;
-    }
-
-    public bool CanPerformStep(EntityUid user, EntityUid body, EntityUid part,
-        EntityUid step, bool doPopup, out string? popup, out StepInvalidReason reason,
-        out Dictionary<EntityUid, float>? validTools)
-    {
-        var type = BodyPartType.Other;
-        if (TryComp(part, out BodyPartComponent? partComp))
-        {
-            type = partComp.PartType;
-        }
-
-        var slot = type switch
-        {
-            BodyPartType.Head => SlotFlags.HEAD,
-            BodyPartType.Torso => SlotFlags.OUTERCLOTHING | SlotFlags.INNERCLOTHING,
-            BodyPartType.Arm => SlotFlags.OUTERCLOTHING | SlotFlags.INNERCLOTHING,
-            BodyPartType.Hand => SlotFlags.GLOVES,
-            BodyPartType.Leg => SlotFlags.OUTERCLOTHING | SlotFlags.LEGS,
-            BodyPartType.Foot => SlotFlags.FEET,
-            BodyPartType.Tail => SlotFlags.NONE,
-            BodyPartType.Other => SlotFlags.NONE,
-            _ => SlotFlags.NONE
-        };
-
-        var check = new SurgeryCanPerformStepEvent(user, body, GetTools(user), slot);
-        RaiseLocalEvent(step, ref check);
-        popup = check.Popup;
-        validTools = check.ValidTools;
-
-        if (check.Invalid != StepInvalidReason.None)
-        {
-            if (doPopup && check.Popup != null)
-                _popup.PopupEntity(check.Popup, user, user, PopupType.SmallCaution);
-
-            reason = check.Invalid;
-            return false;
-        }
-
-        reason = default;
-        return true;
-    }
-
-    public bool CanPerformStep(EntityUid user, EntityUid body, EntityUid part, EntityUid step, bool doPopup)
-    {
-        return CanPerformStep(user, body, part, step, doPopup, out _, out _, out _);
-    }
-
-    public bool IsStepComplete(EntityUid body, EntityUid part, EntProtoId step, EntityUid surgery)
-    {
-        if (GetSingleton(step) is not { } stepEnt)
-            return false;
-
-        var ev = new SurgeryStepCompleteCheckEvent(body, part, surgery);
-        RaiseLocalEvent(stepEnt, ref ev);
-        return !ev.Cancelled;
-    }
-
-    private bool AnyHaveComp(List<EntityUid> tools, IComponent component, out EntityUid withComp, out float speed)
-    {
-        foreach (var tool in tools)
-        {
-            if (EntityManager.TryGetComponent(tool, component.GetType(), out var found) && found is ISurgeryToolComponent toolComp)
-            {
-                withComp = tool;
-                speed = toolComp.Speed;
-                return true;
-            }
-        }
-
-        withComp = EntityUid.Invalid;
-        speed = 1f;
-        return false;
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.cs b/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.cs
deleted file mode 100644
index 48b19e21fd7..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-using System.Linq;
-using Content.Shared._CorvaxNext.Surgery.Conditions;
-using Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-using Content.Shared.Medical.Surgery.Conditions;
-using Content.Shared.Body.Systems;
-using Content.Shared.Medical.Surgery.Steps;
-using Content.Shared.Body.Part;
-using Content.Shared.Damage;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Body.Components;
-using Content.Shared.Buckle.Components;
-using Content.Shared.DoAfter;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.GameTicking;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Content.Shared.Interaction;
-using Content.Shared.Inventory;
-using Content.Shared.Popups;
-using Content.Shared.Standing;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Network;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-public abstract partial class SharedSurgerySystem : EntitySystem
-{
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly IComponentFactory _compFactory = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly IPrototypeManager _prototypes = default!;
-    [Dependency] private readonly RotateToFaceSystem _rotateToFace = default!;
-    [Dependency] private readonly StandingStateSystem _standing = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-
-    private readonly Dictionary<EntProtoId, EntityUid> _surgeries = new();
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
-
-        SubscribeLocalEvent<SurgeryTargetComponent, SurgeryDoAfterEvent>(OnTargetDoAfter);
-        SubscribeLocalEvent<SurgeryCloseIncisionConditionComponent, SurgeryValidEvent>(OnCloseIncisionValid);
-        //SubscribeLocalEvent<SurgeryLarvaConditionComponent, SurgeryValidEvent>(OnLarvaValid);
-        SubscribeLocalEvent<SurgeryComponentConditionComponent, SurgeryValidEvent>(OnComponentConditionValid);
-        SubscribeLocalEvent<SurgeryPartConditionComponent, SurgeryValidEvent>(OnPartConditionValid);
-        SubscribeLocalEvent<SurgeryOrganConditionComponent, SurgeryValidEvent>(OnOrganConditionValid);
-        SubscribeLocalEvent<SurgeryWoundedConditionComponent, SurgeryValidEvent>(OnWoundedValid);
-        SubscribeLocalEvent<SurgeryPartRemovedConditionComponent, SurgeryValidEvent>(OnPartRemovedConditionValid);
-        SubscribeLocalEvent<SurgeryPartPresentConditionComponent, SurgeryValidEvent>(OnPartPresentConditionValid);
-        SubscribeLocalEvent<SurgeryMarkingConditionComponent, SurgeryValidEvent>(OnMarkingPresentValid);
-        //SubscribeLocalEvent<SurgeryRemoveLarvaComponent, SurgeryCompletedEvent>(OnRemoveLarva);
-
-        InitializeSteps();
-    }
-
-    private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev)
-    {
-        _surgeries.Clear();
-    }
-
-    private void OnTargetDoAfter(Entity<SurgeryTargetComponent> ent, ref SurgeryDoAfterEvent args)
-    {
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
-        if (args.Cancelled
-            || args.Handled
-            || args.Target is not { } target
-            || !IsSurgeryValid(ent, target, args.Surgery, args.Step, args.User, out var surgery, out var part, out var step)
-            || !PreviousStepsComplete(ent, part, surgery, args.Step)
-            || !CanPerformStep(args.User, ent, part, step, false))
-        {
-            Log.Warning($"{ToPrettyString(args.User)} tried to start invalid surgery.");
-            return;
-        }
-
-        args.Repeat = (HasComp<SurgeryRepeatableStepComponent>(step) && !IsStepComplete(ent, part, args.Step, surgery));
-        var ev = new SurgeryStepEvent(args.User, ent, part, GetTools(args.User), surgery);
-        RaiseLocalEvent(step, ref ev);
-        RefreshUI(ent);
-    }
-
-    private void OnCloseIncisionValid(Entity<SurgeryCloseIncisionConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        if (!HasComp<IncisionOpenComponent>(args.Part) ||
-            !HasComp<BleedersClampedComponent>(args.Part) ||
-            !HasComp<SkinRetractedComponent>(args.Part) ||
-            !HasComp<BodyPartReattachedComponent>(args.Part) ||
-            !HasComp<InternalBleedersClampedComponent>(args.Part))
-        {
-            args.Cancelled = true;
-        }
-    }
-
-    private void OnWoundedValid(Entity<SurgeryWoundedConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        if (!TryComp(args.Body, out DamageableComponent? damageable)
-            || !TryComp(args.Part, out DamageableComponent? partDamageable)
-            || damageable.TotalDamage <= 0
-            && partDamageable.TotalDamage <= 0
-            && !HasComp<IncisionOpenComponent>(args.Part))
-            args.Cancelled = true;
-    }
-
-    /*private void OnLarvaValid(Entity<SurgeryLarvaConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        if (!TryComp(args.Body, out VictimInfectedComponent? infected))
-            args.Cancelled = true;
-
-        // The larva has fully developed and surgery is now impossible
-        if (infected != null && infected.SpawnedLarva != null)
-            args.Cancelled = true;
-    }*/
-
-    private void OnComponentConditionValid(Entity<SurgeryComponentConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        var present = true;
-        foreach (var reg in ent.Comp.Component.Values)
-        {
-            var compType = reg.Component.GetType();
-            if (!HasComp(args.Part, compType))
-                present = false;
-        }
-
-        if (ent.Comp.Inverse ? present : !present)
-            args.Cancelled = true;
-    }
-
-    private void OnPartConditionValid(Entity<SurgeryPartConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        if (!TryComp<BodyPartComponent>(args.Part, out var part))
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        var typeMatch = part.PartType == ent.Comp.Part;
-        var symmetryMatch = ent.Comp.Symmetry == null || part.Symmetry == ent.Comp.Symmetry;
-        var valid = typeMatch && symmetryMatch;
-
-        if (ent.Comp.Inverse ? valid : !valid)
-            args.Cancelled = true;
-    }
-
-    private void OnOrganConditionValid(Entity<SurgeryOrganConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        if (!TryComp<BodyPartComponent>(args.Part, out var partComp)
-            || partComp.Body != args.Body
-            || ent.Comp.Organ == null)
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        foreach (var reg in ent.Comp.Organ.Values)
-        {
-            if (_body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs)
-                && organs.Count > 0)
-            {
-                if (ent.Comp.Inverse
-                    && (!ent.Comp.Reattaching
-                    || ent.Comp.Reattaching
-                    && !organs.Any(organ => HasComp<OrganReattachedComponent>(organ.Id))))
-                    args.Cancelled = true;
-            }
-            else if (!ent.Comp.Inverse)
-                args.Cancelled = true;
-        }
-    }
-
-    private void OnPartRemovedConditionValid(Entity<SurgeryPartRemovedConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        if (!_body.CanAttachToSlot(args.Part, ent.Comp.Connection))
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        var results = _body.GetBodyChildrenOfType(args.Body, ent.Comp.Part, symmetry: ent.Comp.Symmetry).ToList();
-        if (results is not { } || !results.Any())
-            return;
-
-        if (!results.Any(part => HasComp<BodyPartReattachedComponent>(part.Id)))
-            args.Cancelled = true;
-    }
-
-    private void OnPartPresentConditionValid(Entity<SurgeryPartPresentConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        if (args.Part == EntityUid.Invalid
-            || !HasComp<BodyPartComponent>(args.Part))
-            args.Cancelled = true;
-    }
-
-    private void OnMarkingPresentValid(Entity<SurgeryMarkingConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        var markingCategory = MarkingCategoriesConversion.FromHumanoidVisualLayers(ent.Comp.MarkingCategory);
-
-        var hasMarking = TryComp(args.Body, out HumanoidAppearanceComponent? bodyAppearance)
-            && bodyAppearance.MarkingSet.Markings.TryGetValue(markingCategory, out var markingList)
-            && markingList.Any(marking => marking.MarkingId.Contains(ent.Comp.MatchString));
-
-        if ((!ent.Comp.Inverse && hasMarking) || (ent.Comp.Inverse && !hasMarking))
-            args.Cancelled = true;
-    }
-
-    /*private void OnRemoveLarva(Entity<SurgeryRemoveLarvaComponent> ent, ref SurgeryCompletedEvent args)
-    {
-        RemCompDeferred<VictimInfectedComponent>(ent);
-    }*/
-
-    protected bool IsSurgeryValid(EntityUid body, EntityUid targetPart, EntProtoId surgery, EntProtoId stepId,
-        EntityUid user, out Entity<SurgeryComponent> surgeryEnt, out EntityUid part, out EntityUid step)
-    {
-        surgeryEnt = default;
-        part = default;
-        step = default;
-
-        if (!HasComp<SurgeryTargetComponent>(body) ||
-            !IsLyingDown(body, user) ||
-            GetSingleton(surgery) is not { } surgeryEntId ||
-            !TryComp(surgeryEntId, out SurgeryComponent? surgeryComp) ||
-            !surgeryComp.Steps.Contains(stepId) ||
-            GetSingleton(stepId) is not { } stepEnt
-            || !HasComp<BodyPartComponent>(targetPart)
-            && !HasComp<BodyComponent>(targetPart))
-            return false;
-
-
-        var ev = new SurgeryValidEvent(body, targetPart);
-        if (_timing.IsFirstTimePredicted)
-        {
-            RaiseLocalEvent(stepEnt, ref ev);
-            RaiseLocalEvent(surgeryEntId, ref ev);
-        }
-
-        if (ev.Cancelled)
-            return false;
-
-        surgeryEnt = (surgeryEntId, surgeryComp);
-        part = targetPart;
-        step = stepEnt;
-        return true;
-    }
-
-    public EntityUid? GetSingleton(EntProtoId surgeryOrStep)
-    {
-        if (!_prototypes.HasIndex(surgeryOrStep))
-            return null;
-
-        // This (for now) assumes that surgery entity data remains unchanged between client
-        // and server
-        // if it does not you get the bullet
-        if (!_surgeries.TryGetValue(surgeryOrStep, out var ent) || TerminatingOrDeleted(ent))
-        {
-            ent = Spawn(surgeryOrStep, MapCoordinates.Nullspace);
-            _surgeries[surgeryOrStep] = ent;
-        }
-
-        return ent;
-    }
-
-    private List<EntityUid> GetTools(EntityUid surgeon)
-    {
-        return _hands.EnumerateHeld(surgeon).ToList();
-    }
-
-    public bool IsLyingDown(EntityUid entity, EntityUid user)
-    {
-        if (_standing.IsDown(entity))
-            return true;
-
-        if (TryComp(entity, out BuckleComponent? buckle) &&
-            TryComp(buckle.BuckledTo, out StrapComponent? strap))
-        {
-            var rotation = strap.Rotation;
-            if (rotation.GetCardinalDir() is Direction.West or Direction.East)
-                return true;
-        }
-
-        _popup.PopupEntity(Loc.GetString("surgery-error-laying"), user, user);
-
-        return false;
-    }
-
-    protected virtual void RefreshUI(EntityUid body)
-    {
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/StepInvalidReason.cs b/Content.Shared/_CorvaxNext/Surgery/StepInvalidReason.cs
deleted file mode 100644
index 696ebd34b85..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/StepInvalidReason.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Shared._CorvaxNext.Surgery;
-
-public enum StepInvalidReason
-{
-    None,
-    MissingSkills,
-    NeedsOperatingTable,
-    Armor,
-    MissingTool,
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BleedersClampedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BleedersClampedComponent.cs
deleted file mode 100644
index 5854fd5ed55..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BleedersClampedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BleedersClampedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartReattachedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartReattachedComponent.cs
deleted file mode 100644
index 870ad983b2a..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartReattachedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BodyPartReattachedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartSawedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartSawedComponent.cs
deleted file mode 100644
index 264acc1baa3..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartSawedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BodyPartSawedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/IncisionOpenComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/IncisionOpenComponent.cs
deleted file mode 100644
index 02a18abaca7..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/IncisionOpenComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class IncisionOpenComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/InternalBleedersClampedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/InternalBleedersClampedComponent.cs
deleted file mode 100644
index d25a1084f1c..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/InternalBleedersClampedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class InternalBleedersClampedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/OrganReattachedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/OrganReattachedComponent.cs
deleted file mode 100644
index 30ada57bbf5..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/OrganReattachedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class OrganReattachedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/PartRemovedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/PartRemovedComponent.cs
deleted file mode 100644
index f7b14628e9c..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/PartRemovedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class PartsRemovedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageOpenComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageOpenComponent.cs
deleted file mode 100644
index e32197c76a5..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageOpenComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class RibcageOpenComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageSawedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageSawedComponent.cs
deleted file mode 100644
index ff749649ce8..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageSawedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class RibcageSawedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/SkinRetractedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/SkinRetractedComponent.cs
deleted file mode 100644
index b7ee51a9b8e..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/SkinRetractedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SkinRetractedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddMarkingStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
deleted file mode 100644
index a9e23567da0..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Humanoid;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAddMarkingStepComponent : Component
-{
-    /// <summary>
-    ///     The marking category to add the marking to.
-    /// </summary>
-    [DataField]
-    public HumanoidVisualLayers MarkingCategory = default!;
-
-    /// <summary>
-    ///     Can be either a segment of a marking ID, or an entire ID that will be checked
-    ///     against the entity to validate that the marking is not already present.
-    /// </summary>
-    [DataField]
-    public String MatchString = "";
-
-    /// <summary>
-    ///     What type of organ is required for this surgery?
-    /// </summary>
-    [DataField]
-    public ComponentRegistry? Organ;
-
-    /// <summary>
-    ///     Component name for accent that will be applied.
-    /// </summary>
-    [DataField]
-    public ComponentRegistry? Accent;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddOrganStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddOrganStepComponent.cs
deleted file mode 100644
index 773cc634fae..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddOrganStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAddOrganStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddPartStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddPartStepComponent.cs
deleted file mode 100644
index 0229552ae8a..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddPartStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAddPartStepComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixOrganStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixOrganStepComponent.cs
deleted file mode 100644
index 5f82cbe4251..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixOrganStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAffixOrganStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixPartStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixPartStepComponent.cs
deleted file mode 100644
index cc080e8be0b..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixPartStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAffixPartStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCanPerformStepEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCanPerformStepEvent.cs
deleted file mode 100644
index a2daea6254f..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCanPerformStepEvent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Inventory;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
-
-[ByRefEvent]
-public record struct SurgeryCanPerformStepEvent(
-    EntityUid User,
-    EntityUid Body,
-    List<EntityUid> Tools,
-    SlotFlags TargetSlots,
-    string? Popup = null,
-    StepInvalidReason Invalid = StepInvalidReason.None,
-    Dictionary<EntityUid, float>? ValidTools = null
-) : IInventoryRelayEvent;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCutLarvaRootsStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCutLarvaRootsStepComponent.cs
deleted file mode 100644
index 55f3e568213..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCutLarvaRootsStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryCutLarvaRootsStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
deleted file mode 100644
index 47368a154c0..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Robust.Shared.Prototypes;
-using Content.Shared.Humanoid;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRemoveMarkingStepComponent : Component
-{
-    /// <summary>
-    ///     The category the marking belongs to.
-    /// </summary>
-    [DataField]
-    public HumanoidVisualLayers MarkingCategory = default!;
-
-    /// <summary>
-    ///     Can be either a segment of a marking ID, or an entire ID that will be checked
-    ///     against the entity to validate that the marking is present.
-    /// </summary>
-    [DataField]
-    public String MatchString = "";
-
-    /// <summary>
-    ///     Will this step spawn an item as a result of removing the markings? If so, which?
-    /// </summary>
-    [DataField]
-    public EntProtoId? ItemSpawn = default!;
-
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveOrganStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveOrganStepComponent.cs
deleted file mode 100644
index 3efe15d710c..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveOrganStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRemoveOrganStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemovePartStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemovePartStepComponent.cs
deleted file mode 100644
index 7780f252000..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemovePartStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRemovePartStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRepeatableStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRepeatableStepComponent.cs
deleted file mode 100644
index 14010b7e962..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRepeatableStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRepeatableStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepCompleteCheckEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepCompleteCheckEvent.cs
deleted file mode 100644
index 13d1e4da6cc..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepCompleteCheckEvent.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
-
-[ByRefEvent]
-public record struct SurgeryStepCompleteCheckEvent(EntityUid Body, EntityUid Part, EntityUid Surgery, bool Cancelled = false);
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepComponent.cs
deleted file mode 100644
index 8a4bee9541d..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-[Prototype("SurgerySteps")]
-public sealed partial class SurgeryStepComponent : Component
-{
-
-    [DataField]
-    public ComponentRegistry? Tool;
-
-    [DataField]
-    public ComponentRegistry? Add;
-
-    [DataField]
-    public ComponentRegistry? BodyAdd;
-
-    [DataField]
-    public ComponentRegistry? Remove;
-
-    [DataField]
-    public ComponentRegistry? BodyRemove;
-
-    [DataField]
-    public float Duration = 2f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryComponent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryComponent.cs
deleted file mode 100644
index 6f3c8d8e9c5..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SurgeryComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Prototype("Surgeries")]
-public sealed partial class SurgeryComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public int Priority;
-
-    [DataField, AutoNetworkedField]
-    public EntProtoId? Requirement;
-
-    [DataField(required: true), AutoNetworkedField]
-    public List<EntProtoId> Steps = new();
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryDoAfterEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryDoAfterEvent.cs
deleted file mode 100644
index e8d9ced1cca..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SurgeryDoAfterEvent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-[Serializable, NetSerializable]
-public sealed partial class SurgeryDoAfterEvent : SimpleDoAfterEvent
-{
-    public readonly EntProtoId Surgery;
-    public readonly EntProtoId Step;
-
-    public SurgeryDoAfterEvent(EntProtoId surgery, EntProtoId step)
-    {
-        Surgery = surgery;
-        Step = step;
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgerySpeedModifierComponent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgerySpeedModifierComponent.cs
deleted file mode 100644
index 32ce00f2c38..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SurgerySpeedModifierComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgerySpeedModifierComponent : Component
-{
-    [DataField]
-    public float SpeedModifier = 1.5f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageChangeEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageChangeEvent.cs
deleted file mode 100644
index c92a4589274..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageChangeEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-/// <summary>
-///     Raised on the target entity.
-/// </summary>
-[ByRefEvent]
-public record struct SurgeryStepDamageChangeEvent(EntityUid User, EntityUid Body, EntityUid Part, EntityUid Step);
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageEvent.cs
deleted file mode 100644
index 256ee460247..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-/// <summary>
-///     Raised on the target entity.
-/// </summary>
-[ByRefEvent]
-public record struct SurgeryStepDamageEvent(EntityUid User, EntityUid Body, EntityUid Part, EntityUid Surgery, DamageSpecifier Damage, float PartMultiplier);
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryStepEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryStepEvent.cs
deleted file mode 100644
index 3979e975273..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SurgeryStepEvent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared._CorvaxNext.Surgery;
-
-/// <summary>
-///     Raised on the step entity.
-/// </summary>
-[ByRefEvent]
-public record struct SurgeryStepEvent(EntityUid User, EntityUid Body, EntityUid Part, List<EntityUid> Tools, EntityUid Surgery);
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryTargetComponent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryTargetComponent.cs
deleted file mode 100644
index 446303fc7d9..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SurgeryTargetComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryTargetComponent : Component
-{
-    [DataField]
-    public bool CanOperate = true;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryUI.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryUI.cs
deleted file mode 100644
index d738482f240..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SurgeryUI.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-[Serializable, NetSerializable]
-public enum SurgeryUIKey
-{
-    Key
-}
-
-[Serializable, NetSerializable]
-public sealed class SurgeryBuiState(Dictionary<NetEntity, List<EntProtoId>> choices) : BoundUserInterfaceState
-{
-    public readonly Dictionary<NetEntity, List<EntProtoId>> Choices = choices;
-}
-
-[Serializable, NetSerializable]
-public sealed class SurgeryBuiRefreshMessage : BoundUserInterfaceMessage
-{
-}
-
-[Serializable, NetSerializable]
-public sealed class SurgeryStepChosenBuiMsg(NetEntity part, EntProtoId surgery, EntProtoId step, bool isBody) : BoundUserInterfaceMessage
-{
-    public readonly NetEntity Part = part;
-    public readonly EntProtoId Surgery = surgery;
-    public readonly EntProtoId Step = step;
-
-    // Used as a marker for whether or not we're hijacking surgery by applying it on the body itself.
-    public readonly bool IsBody = isBody;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryUiRefreshEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryUiRefreshEvent.cs
deleted file mode 100644
index 701a69b93f1..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/SurgeryUiRefreshEvent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._CorvaxNext.Surgery;
-
-[Serializable, NetSerializable]
-public sealed class SurgeryUiRefreshEvent : EntityEventArgs
-{
-    public NetEntity Uid { get; }
-
-    public SurgeryUiRefreshEvent(NetEntity uid)
-    {
-        Uid = uid;
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/BoneGelComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/BoneGelComponent.cs
deleted file mode 100644
index 14f0d8720f0..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/BoneGelComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BoneGelComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "bone gel";
-
-    public bool? Used { get; set; } = null;
-
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSawComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSawComponent.cs
deleted file mode 100644
index 74307449204..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSawComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BoneSawComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a bone saw";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSetterComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSetterComponent.cs
deleted file mode 100644
index f8c7421e4b5..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSetterComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BoneSetterComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a bone setter";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/CauteryComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/CauteryComponent.cs
deleted file mode 100644
index 44ac0d8c3dc..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/CauteryComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class CauteryComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a cautery";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/DrillComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/DrillComponent.cs
deleted file mode 100644
index 6e71567e65a..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/DrillComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class DrillComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a drill";
-    public bool? Used { get; set; } = null;
-
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/HemostatComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/HemostatComponent.cs
deleted file mode 100644
index 91ce2be49d5..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/HemostatComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class HemostatComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a hemostat";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/ISurgeryToolComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/ISurgeryToolComponent.cs
deleted file mode 100644
index 51d527abe3d..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/ISurgeryToolComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-public interface ISurgeryToolComponent
-{
-    [DataField]
-    public string ToolName { get; }
-
-    // Mostly intended for discardable or non-reusable tools.
-    [DataField]
-    public bool? Used { get; set; }
-
-    /// <summary>
-    ///     Multiply the step's doafter by this value.
-    ///     This is per-type so you can have something that's a good scalpel but a bad retractor.
-    /// </summary>
-    [DataField]
-    public float Speed { get; set; }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/RetractorComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/RetractorComponent.cs
deleted file mode 100644
index bd991db0cd3..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/RetractorComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class RetractorComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a retractor";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/ScalpelComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/ScalpelComponent.cs
deleted file mode 100644
index 1c5193a922b..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/ScalpelComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class ScalpelComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a scalpel";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolComponent.cs
deleted file mode 100644
index e9cae2b3c06..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class SurgeryToolComponent : Component
-{
-
-    [DataField, AutoNetworkedField]
-    public SoundSpecifier? StartSound;
-
-    [DataField, AutoNetworkedField]
-    public SoundSpecifier? EndSound;
-}
-
-/// <summary>
-///     Raised on a tool to see if it can be used in a surgery step.
-///     If this is cancelled the step can't be completed.
-/// </summary>
-[ByRefEvent]
-public record struct SurgeryToolUsedEvent(EntityUid User, EntityUid Target, bool Cancelled = false);
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolConditionsSystem.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolConditionsSystem.cs
deleted file mode 100644
index f8b9205a126..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolConditionsSystem.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Content.Shared.Item.ItemToggle.Components;
-using Content.Shared.Popups;
-using Content.Shared.Smoking;
-using Content.Shared.Smoking.Components;
-using Content.Shared.Weapons.Ranged;
-using Content.Shared.Weapons.Ranged.Components;
-using Content.Shared.Weapons.Ranged.Events;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-/// <summary>
-///  Prevents using esword or welder when off, laser when no charges.
-/// </summary>
-public sealed class SurgeryToolConditionsSystem : EntitySystem
-{
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ItemToggleComponent, SurgeryToolUsedEvent>(OnToggleUsed);
-        SubscribeLocalEvent<GunComponent, SurgeryToolUsedEvent>(OnGunUsed);
-        SubscribeLocalEvent<MatchstickComponent, SurgeryToolUsedEvent>(OnMatchUsed);
-    }
-
-    private void OnToggleUsed(Entity<ItemToggleComponent> ent, ref SurgeryToolUsedEvent args)
-    {
-        if (ent.Comp.Activated)
-            return;
-
-        _popup.PopupEntity(Loc.GetString("surgery-tool-turn-on"), ent, args.User);
-        args.Cancelled = true;
-    }
-
-    private void OnGunUsed(Entity<GunComponent> ent, ref SurgeryToolUsedEvent args)
-    {
-        var coords = Transform(args.User).Coordinates;
-        var ev = new TakeAmmoEvent(1, new List<(EntityUid? Entity, IShootable Shootable)>(), coords, args.User);
-        if (ev.Ammo.Count > 0)
-            return;
-
-        _popup.PopupEntity(Loc.GetString("surgery-tool-reload"), ent, args.User);
-        args.Cancelled = true;
-    }
-
-    private void OnMatchUsed(Entity<MatchstickComponent> ent, ref SurgeryToolUsedEvent args)
-    {
-        var state = ent.Comp.CurrentState;
-        if (state == SmokableState.Lit)
-            return;
-
-        var key = "surgery-tool-match-" + (state == SmokableState.Burnt ? "replace" : "light");
-        _popup.PopupEntity(Loc.GetString(key), ent, args.User);
-        args.Cancelled = true;
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolExamineSystem.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolExamineSystem.cs
deleted file mode 100644
index 112b2043ffb..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolExamineSystem.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Content.Shared.Body.Organ;
-using Content.Shared.Body.Part;
-using Content.Shared.Examine;
-using Content.Shared.Verbs;
-using Robust.Shared.Utility;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-/// <summary>
-///     Examining a surgical or ghetto tool shows everything it can be used for.
-/// </summary>
-public sealed class SurgeryToolExamineSystem : EntitySystem
-{
-    [Dependency] private readonly ExamineSystemShared _examine = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<SurgeryToolComponent, GetVerbsEvent<ExamineVerb>>(OnGetVerbs);
-
-        SubscribeLocalEvent<BoneGelComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<BoneSawComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<CauteryComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<HemostatComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<RetractorComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<ScalpelComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<DrillComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<TendingComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<TweezersComponent, SurgeryToolExaminedEvent>(OnExamined);
-
-        SubscribeLocalEvent<BodyPartComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<OrganComponent, SurgeryToolExaminedEvent>(OnExamined);
-    }
-
-    private void OnGetVerbs(Entity<SurgeryToolComponent> ent, ref GetVerbsEvent<ExamineVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess)
-            return;
-
-        var msg = FormattedMessage.FromMarkupOrThrow(Loc.GetString("surgery-tool-header"));
-        msg.PushNewline();
-        var ev = new SurgeryToolExaminedEvent(msg);
-        RaiseLocalEvent(ent, ref ev);
-
-        _examine.AddDetailedExamineVerb(args, ent.Comp, ev.Message,
-            Loc.GetString("surgery-tool-examinable-verb-text"), "/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png",
-            Loc.GetString("surgery-tool-examinable-verb-message"));
-    }
-
-    private void OnExamined(EntityUid uid, ISurgeryToolComponent comp, ref SurgeryToolExaminedEvent args)
-    {
-        var msg = args.Message;
-        var color = comp.Speed switch
-        {
-            < 1f => "red",
-            > 1f => "green",
-            _ => "white"
-        };
-        var key = "surgery-tool-" + (comp.Used == true ? "used" : "unlimited");
-        var speed = comp.Speed.ToString("N2"); // 2 decimal places to not get trolled by float
-        msg.PushMarkup(Loc.GetString(key, ("tool", comp.ToolName), ("speed", speed), ("color", color)));
-    }
-}
-
-[ByRefEvent]
-public record struct SurgeryToolExaminedEvent(FormattedMessage Message);
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/TendingComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/TendingComponent.cs
deleted file mode 100644
index 42dde8264da..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/TendingComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-/// <summary>
-///     Like Hemostat but lets ghetto tools be used differently for clamping and tending wounds.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class TendingComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a wound tender";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/TweezersComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/TweezersComponent.cs
deleted file mode 100644
index cac94fae0e8..00000000000
--- a/Content.Shared/_CorvaxNext/Surgery/Tools/TweezersComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Surgery.Tools;
-
-/// <summary>
-///     Like Hemostat but lets ghetto tools be used differently for clamping and removing organs.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class TweezersComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "tweezers";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_CorvaxNext/Targeting/Events.cs b/Content.Shared/_CorvaxNext/Targeting/Events.cs
deleted file mode 100644
index 01c08c12c71..00000000000
--- a/Content.Shared/_CorvaxNext/Targeting/Events.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._CorvaxNext.Targeting;
-
-[Serializable, NetSerializable]
-public sealed class TargetChangeEvent : EntityEventArgs
-{
-    public NetEntity Uid { get; }
-    public TargetBodyPart BodyPart { get; }
-    public TargetChangeEvent(NetEntity uid, TargetBodyPart bodyPart)
-    {
-        Uid = uid;
-        BodyPart = bodyPart;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed class TargetIntegrityChangeEvent : EntityEventArgs
-{
-    public NetEntity Uid { get; }
-    public bool RefreshUi { get; }
-    public TargetIntegrityChangeEvent(NetEntity uid, bool refreshUi = true)
-    {
-        Uid = uid;
-        RefreshUi = refreshUi;
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Targeting/SharedTargetingSystem.cs b/Content.Shared/_CorvaxNext/Targeting/SharedTargetingSystem.cs
deleted file mode 100644
index 9c5e7b77254..00000000000
--- a/Content.Shared/_CorvaxNext/Targeting/SharedTargetingSystem.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace Content.Shared._CorvaxNext.Targeting;
-
-public abstract class SharedTargetingSystem : EntitySystem
-{
-    /// <summary>
-    /// Returns all Valid target body parts as an array.
-    /// </summary>
-    public static TargetBodyPart[] GetValidParts()
-    {
-        var parts = new[]
-        {
-            TargetBodyPart.Head,
-            TargetBodyPart.Torso,
-            //TargetBodyPart.Groin,
-            TargetBodyPart.LeftArm,
-            TargetBodyPart.LeftHand,
-            TargetBodyPart.LeftLeg,
-            TargetBodyPart.LeftFoot,
-            TargetBodyPart.RightArm,
-            TargetBodyPart.RightHand,
-            TargetBodyPart.RightLeg,
-            TargetBodyPart.RightFoot,
-        };
-
-        return parts;
-    }
-}
diff --git a/Content.Shared/_CorvaxNext/Targeting/TargetBodyPart.cs b/Content.Shared/_CorvaxNext/Targeting/TargetBodyPart.cs
deleted file mode 100644
index 0e49028069c..00000000000
--- a/Content.Shared/_CorvaxNext/Targeting/TargetBodyPart.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Content.Shared._CorvaxNext.Targeting;
-
-/// <summary>
-/// Represents and enum of possible target parts.
-/// </summary>
-/// <remarks>
-/// To get all body parts as an Array, use static
-/// method in SharedTargetingSystem GetValidParts.
-/// </remarks>
-[Flags]
-public enum TargetBodyPart : ushort
-{
-    Head = 1,
-    Torso = 1 << 1,
-    Groin = 1 << 2,
-    LeftArm = 1 << 3,
-    LeftHand = 1 << 4,
-    RightArm = 1 << 5,
-    RightHand = 1 << 6,
-    LeftLeg = 1 << 7,
-    LeftFoot = 1 << 8,
-    RightLeg = 1 << 9,
-    RightFoot = 1 << 10,
-
-    Hands = LeftHand | RightHand,
-    Arms = LeftArm | RightArm,
-    Legs = LeftLeg | RightLeg,
-    Feet = LeftFoot | RightFoot,
-    All = Head | Torso | Groin | LeftArm | LeftHand | RightArm | RightHand | LeftLeg | LeftFoot | RightLeg | RightFoot,
-}
diff --git a/Content.Shared/_CorvaxNext/Targeting/TargetIntegrity.cs b/Content.Shared/_CorvaxNext/Targeting/TargetIntegrity.cs
deleted file mode 100644
index 7ded5b0123f..00000000000
--- a/Content.Shared/_CorvaxNext/Targeting/TargetIntegrity.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Content.Shared._CorvaxNext.Targeting;
-public enum TargetIntegrity
-{
-    Healthy = 0,
-    LightlyWounded = 1,
-    SomewhatWounded = 2,
-    ModeratelyWounded = 3,
-    HeavilyWounded = 4,
-    CriticallyWounded = 5,
-    Severed = 6,
-    Dead = 7,
-    Disabled = 8,
-}
diff --git a/Content.Shared/_CorvaxNext/Targeting/TargetingComponent.cs b/Content.Shared/_CorvaxNext/Targeting/TargetingComponent.cs
deleted file mode 100644
index a558a09ecd2..00000000000
--- a/Content.Shared/_CorvaxNext/Targeting/TargetingComponent.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._CorvaxNext.Targeting;
-
-/// <summary>
-/// Controls entity limb targeting for actions.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class TargetingComponent : Component
-{
-    [ViewVariables, AutoNetworkedField]
-    public TargetBodyPart Target = TargetBodyPart.Torso;
-
-    /// <summary>
-    /// What odds does the entity have of targeting each body part?
-    /// </summary>
-    [DataField]
-    public Dictionary<TargetBodyPart, float> TargetOdds = new()
-    {
-        { TargetBodyPart.Head, 0.1f },
-        { TargetBodyPart.Torso, 0.3f },
-        { TargetBodyPart.Groin, 0.1f },
-        { TargetBodyPart.LeftArm, 0.1f },
-        { TargetBodyPart.LeftHand, 0.05f },
-        { TargetBodyPart.RightArm, 0.1f },
-        { TargetBodyPart.RightHand, 0.05f },
-        { TargetBodyPart.LeftLeg, 0.1f },
-        { TargetBodyPart.LeftFoot, 0.05f },
-        { TargetBodyPart.RightLeg, 0.1f },
-        { TargetBodyPart.RightFoot, 0.05f }
-    };
-
-    /// <summary>
-    /// What is the current integrity of each body part?
-    /// </summary>
-    [ViewVariables, AutoNetworkedField]
-    public Dictionary<TargetBodyPart, TargetIntegrity> BodyStatus = new()
-    {
-        { TargetBodyPart.Head, TargetIntegrity.Healthy },
-        { TargetBodyPart.Torso, TargetIntegrity.Healthy },
-        { TargetBodyPart.Groin, TargetIntegrity.Healthy },
-        { TargetBodyPart.LeftArm, TargetIntegrity.Healthy },
-        { TargetBodyPart.LeftHand, TargetIntegrity.Healthy },
-        { TargetBodyPart.RightArm, TargetIntegrity.Healthy },
-        { TargetBodyPart.RightHand, TargetIntegrity.Healthy },
-        { TargetBodyPart.LeftLeg, TargetIntegrity.Healthy },
-        { TargetBodyPart.LeftFoot, TargetIntegrity.Healthy },
-        { TargetBodyPart.RightLeg, TargetIntegrity.Healthy },
-        { TargetBodyPart.RightFoot, TargetIntegrity.Healthy }
-    };
-
-    /// <summary>
-    /// What noise does the entity play when swapping targets?
-    /// </summary>
-    [DataField]
-    public string SwapSound = "/Audio/Effects/toggleoncombat.ogg";
-}
diff --git a/Resources/Audio/Medical/Surgery/attributions.yml b/Resources/Audio/Medical/Surgery/attributions.yml
deleted file mode 100644
index c88a3e0b70f..00000000000
--- a/Resources/Audio/Medical/Surgery/attributions.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-- files: ["cautery1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery1.ogg"
-
-- files: ["cautery2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery2.ogg"
-
-- files: ["hemostat.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/hemostat.ogg"
-
-- files: ["organ1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ1.ogg"
-
-- files: ["organ2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ2.ogg"
-
-- files: ["retractor1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor1.ogg"
-
-- files: ["retractor2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor2.ogg"
-
-- files: ["saw.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/saw.ogg"
-
-- files: ["scalpel1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel1.ogg"
-
-- files: ["scalpel2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel2.ogg"
\ No newline at end of file
diff --git a/Resources/Audio/Medical/Surgery/cautery1.ogg b/Resources/Audio/Medical/Surgery/cautery1.ogg
deleted file mode 100644
index fbd9f2b4d86..00000000000
Binary files a/Resources/Audio/Medical/Surgery/cautery1.ogg and /dev/null differ
diff --git a/Resources/Audio/Medical/Surgery/cautery2.ogg b/Resources/Audio/Medical/Surgery/cautery2.ogg
deleted file mode 100644
index cc91e9f3ce6..00000000000
Binary files a/Resources/Audio/Medical/Surgery/cautery2.ogg and /dev/null differ
diff --git a/Resources/Audio/Medical/Surgery/hemostat1.ogg b/Resources/Audio/Medical/Surgery/hemostat1.ogg
deleted file mode 100644
index e624bafafbf..00000000000
Binary files a/Resources/Audio/Medical/Surgery/hemostat1.ogg and /dev/null differ
diff --git a/Resources/Audio/Medical/Surgery/organ1.ogg b/Resources/Audio/Medical/Surgery/organ1.ogg
deleted file mode 100644
index 37eaffc1a34..00000000000
Binary files a/Resources/Audio/Medical/Surgery/organ1.ogg and /dev/null differ
diff --git a/Resources/Audio/Medical/Surgery/organ2.ogg b/Resources/Audio/Medical/Surgery/organ2.ogg
deleted file mode 100644
index 43b22f8354c..00000000000
Binary files a/Resources/Audio/Medical/Surgery/organ2.ogg and /dev/null differ
diff --git a/Resources/Audio/Medical/Surgery/retractor1.ogg b/Resources/Audio/Medical/Surgery/retractor1.ogg
deleted file mode 100644
index 70625c961cf..00000000000
Binary files a/Resources/Audio/Medical/Surgery/retractor1.ogg and /dev/null differ
diff --git a/Resources/Audio/Medical/Surgery/retractor2.ogg b/Resources/Audio/Medical/Surgery/retractor2.ogg
deleted file mode 100644
index 94548ec2504..00000000000
Binary files a/Resources/Audio/Medical/Surgery/retractor2.ogg and /dev/null differ
diff --git a/Resources/Audio/Medical/Surgery/saw.ogg b/Resources/Audio/Medical/Surgery/saw.ogg
deleted file mode 100644
index 62623f6aa3a..00000000000
Binary files a/Resources/Audio/Medical/Surgery/saw.ogg and /dev/null differ
diff --git a/Resources/Audio/Medical/Surgery/scalpel1.ogg b/Resources/Audio/Medical/Surgery/scalpel1.ogg
deleted file mode 100644
index f292d1024da..00000000000
Binary files a/Resources/Audio/Medical/Surgery/scalpel1.ogg and /dev/null differ
diff --git a/Resources/Audio/Medical/Surgery/scalpel2.ogg b/Resources/Audio/Medical/Surgery/scalpel2.ogg
deleted file mode 100644
index 7335f3d9cef..00000000000
Binary files a/Resources/Audio/Medical/Surgery/scalpel2.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/attributions.yml b/Resources/Audio/_CorvaxNext/Medical/Surgery/attributions.yml
deleted file mode 100644
index c88a3e0b70f..00000000000
--- a/Resources/Audio/_CorvaxNext/Medical/Surgery/attributions.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-- files: ["cautery1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery1.ogg"
-
-- files: ["cautery2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery2.ogg"
-
-- files: ["hemostat.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/hemostat.ogg"
-
-- files: ["organ1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ1.ogg"
-
-- files: ["organ2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ2.ogg"
-
-- files: ["retractor1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor1.ogg"
-
-- files: ["retractor2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor2.ogg"
-
-- files: ["saw.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/saw.ogg"
-
-- files: ["scalpel1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel1.ogg"
-
-- files: ["scalpel2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel2.ogg"
\ No newline at end of file
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/cautery1.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/cautery1.ogg
deleted file mode 100644
index fbd9f2b4d86..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/cautery1.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/cautery2.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/cautery2.ogg
deleted file mode 100644
index cc91e9f3ce6..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/cautery2.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/hemostat1.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/hemostat1.ogg
deleted file mode 100644
index e624bafafbf..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/hemostat1.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/organ1.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/organ1.ogg
deleted file mode 100644
index 37eaffc1a34..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/organ1.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/organ2.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/organ2.ogg
deleted file mode 100644
index 43b22f8354c..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/organ2.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/retractor1.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/retractor1.ogg
deleted file mode 100644
index 70625c961cf..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/retractor1.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/retractor2.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/retractor2.ogg
deleted file mode 100644
index 94548ec2504..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/retractor2.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/saw.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/saw.ogg
deleted file mode 100644
index 62623f6aa3a..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/saw.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/scalpel1.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/scalpel1.ogg
deleted file mode 100644
index f292d1024da..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/scalpel1.ogg and /dev/null differ
diff --git a/Resources/Audio/_CorvaxNext/Medical/Surgery/scalpel2.ogg b/Resources/Audio/_CorvaxNext/Medical/Surgery/scalpel2.ogg
deleted file mode 100644
index 7335f3d9cef..00000000000
Binary files a/Resources/Audio/_CorvaxNext/Medical/Surgery/scalpel2.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/attributions.yml b/Resources/Audio/_Shitmed/Medical/Surgery/attributions.yml
deleted file mode 100644
index c88a3e0b70f..00000000000
--- a/Resources/Audio/_Shitmed/Medical/Surgery/attributions.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-- files: ["cautery1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery1.ogg"
-
-- files: ["cautery2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery2.ogg"
-
-- files: ["hemostat.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/hemostat.ogg"
-
-- files: ["organ1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ1.ogg"
-
-- files: ["organ2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ2.ogg"
-
-- files: ["retractor1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor1.ogg"
-
-- files: ["retractor2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor2.ogg"
-
-- files: ["saw.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/saw.ogg"
-
-- files: ["scalpel1.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel1.ogg"
-
-- files: ["scalpel2.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Taken from cmss13"
-  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel2.ogg"
\ No newline at end of file
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/cautery1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/cautery1.ogg
deleted file mode 100644
index fbd9f2b4d86..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/cautery1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/cautery2.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/cautery2.ogg
deleted file mode 100644
index cc91e9f3ce6..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/cautery2.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/hemostat1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
deleted file mode 100644
index e624bafafbf..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/hemostat1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/organ1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/organ1.ogg
deleted file mode 100644
index 37eaffc1a34..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/organ1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/organ2.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/organ2.ogg
deleted file mode 100644
index 43b22f8354c..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/organ2.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/retractor1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/retractor1.ogg
deleted file mode 100644
index 70625c961cf..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/retractor1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/retractor2.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/retractor2.ogg
deleted file mode 100644
index 94548ec2504..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/retractor2.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/saw.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/saw.ogg
deleted file mode 100644
index 62623f6aa3a..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/saw.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/scalpel1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/scalpel1.ogg
deleted file mode 100644
index f292d1024da..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/scalpel1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/scalpel2.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/scalpel2.ogg
deleted file mode 100644
index 7335f3d9cef..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/scalpel2.ogg and /dev/null differ
diff --git a/Resources/ConfigPresets/Corvax/common.toml b/Resources/ConfigPresets/Corvax/common.toml
index b9751a1dfea..1bc65f34c0f 100644
--- a/Resources/ConfigPresets/Corvax/common.toml
+++ b/Resources/ConfigPresets/Corvax/common.toml
@@ -29,6 +29,3 @@ rich_main_icon_id = "corvax"
 
 [admin]
 see_own_notes = true
-
-[mood]
-enabled = false
diff --git a/Resources/Locale/en-US/_Goobstation/research/technologies.ftl b/Resources/Locale/en-US/_Goobstation/research/technologies.ftl
deleted file mode 100644
index 22240155729..00000000000
--- a/Resources/Locale/en-US/_Goobstation/research/technologies.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-research-technology-weapon-plasma-rifle = Experimental plasma rifle
-research-technology-medical-defense = Medical Control Gear
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Shitmed/inventory/slot-popup.ftl b/Resources/Locale/en-US/_Shitmed/inventory/slot-popup.ftl
deleted file mode 100644
index d921423148c..00000000000
--- a/Resources/Locale/en-US/_Shitmed/inventory/slot-popup.ftl
+++ /dev/null
@@ -1 +0,0 @@
-equip-part-missing-error = {$target} is missing their {$part}!
diff --git a/Resources/Locale/en-US/_Shitmed/surgery/surgery-popup.ftl b/Resources/Locale/en-US/_Shitmed/surgery/surgery-popup.ftl
deleted file mode 100644
index dd49176148b..00000000000
--- a/Resources/Locale/en-US/_Shitmed/surgery/surgery-popup.ftl
+++ /dev/null
@@ -1,53 +0,0 @@
-surgery-popup-step-SurgeryStepOpenIncisionScalpel = {$user} is making an incision on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepClampBleeders = {$user} is clamping the bleeders on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepRetractSkin = {$user} is retracting the skin on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepSawBones = {$user} is sawing through the bones on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepPriseOpenBones = {$user} is prising the bones open on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepCloseBones = {$user} is closing the bones on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepMendRibcage = {$user} is mending the ribcage on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepCloseIncision = {$user} is closing the incision on {$target}'s {$part}.
-
-surgery-popup-step-SurgeryStepInsertFeature = {$user} is inserting something onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachHead-step-SurgeryStepInsertFeature = {$user} is attaching a head onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachLeftArm-step-SurgeryStepInsertFeature = {$user} is attaching a left arm onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachRightArm-step-SurgeryStepInsertFeature = {$user} is attaching a right arm onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachLeftLeg-step-SurgeryStepInsertFeature = {$user} is attaching a left leg onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachRightLeg-step-SurgeryStepInsertFeature = {$user} is attaching a right leg onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachLeftHand-step-SurgeryStepInsertFeature = {$user} is attaching a left hand onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachRightHand-step-SurgeryStepInsertFeature = {$user} is attaching a right hand onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachLeftFoot-step-SurgeryStepInsertFeature = {$user} is attaching a left foot onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachRightFoot-step-SurgeryStepInsertFeature = {$user} is attaching a right foot onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachLegs-step-SurgeryStepInsertFeature = {$user} is attaching legs onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachHands-step-SurgeryStepInsertFeature = {$user} is attaching hands onto {$target}'s {$part}!
-surgery-popup-procedure-SurgeryAttachFeet-step-SurgeryStepInsertFeature = {$user} is attaching feet onto {$target}'s {$part}!
-
-surgery-popup-step-SurgeryStepSealWounds = {$user} is sealing the wounds on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepSawFeature = {$user} is sawing through the bones on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepClampInternalBleeders = {$user} is clamping the internal bleeders on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepRemoveFeature = {$user} is amputating {$target}'s {$part}!
-surgery-popup-step-SurgeryStepCarefulIncisionScalpel = {$user} is carefully making an incision on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepRepairBruteTissue = {$user} is repairing the damaged tissues on {$target}'s {$part}!
-surgery-popup-step-SurgeryStepRepairBurnTissue = {$user} is repairing the burnt tissues on {$target}'s {$part}!
-surgery-popup-step-SurgeryStepSealTendWound = {$user} is sealing the wounds on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepInsertItem = {$user} is inserting something into {$target}'s {$part}!
-surgery-popup-step-SurgeryStepRemoveItem = {$user} is removing something from {$target}'s {$part}!
-
-surgery-popup-step-SurgeryStepRemoveOrgan = {$user} is removing an organ from {$target}'s {$part}!
-surgery-popup-step-SurgeryStepInsertOrgan = {$user} is inserting an organ into {$target}'s {$part}!
-
-surgery-popup-procedure-SurgeryRemoveBrain-step-SurgeryStepRemoveOrgan = {$user} is removing the brain from {$target}'s {$part}!
-surgery-popup-procedure-SurgeryRemoveHeart-step-SurgeryStepRemoveOrgan = {$user} is removing the heart from {$target}'s {$part}!
-surgery-popup-procedure-SurgeryRemoveLiver-step-SurgeryStepRemoveOrgan = {$user} is removing the liver from {$target}'s {$part}!
-surgery-popup-procedure-SurgeryRemoveLungs-step-SurgeryStepRemoveOrgan = {$user} is removing the lungs from {$target}'s {$part}!
-surgery-popup-procedure-SurgeryRemoveEyes-step-SurgeryStepRemoveOrgan = {$user} is removing the eyes from {$target}'s {$part}!
-surgery-popup-procedure-SurgeryRemoveStomach-step-SurgeryStepRemoveOrgan = {$user} is removing the stomach from {$target}'s {$part}!
-
-surgery-popup-procedure-SurgeryInsertBrain-step-SurgeryStepInsertOrgan = {$user} is inserting a brain into {$target}'s {$part}!
-surgery-popup-step-SurgeryStepInsertLungs = {$user} is inserting lungs into {$target}'s {$part}!
-surgery-popup-step-SurgeryStepInsertLiver = {$user} is inserting a liver into {$target}'s {$part}!
-surgery-popup-step-SurgeryStepInsertEyes = {$user} is inserting eyes into {$target}'s {$part}!
-surgery-popup-step-SurgeryStepInsertHeart = {$user} is inserting a heart into {$target}'s {$part}!
-surgery-popup-step-SurgeryStepInsertStomach = {$user} is inserting a stomach into {$target}'s {$part}!
-
-surgery-popup-step-SurgeryStepSealOrganWound = {$user} is sealing the wounds on {$target}'s {$part}.
-surgery-popup-step-SurgeryStepLobotomize = {$user} is drilling a hole into {$target}'s {$part}.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Shitmed/surgery/surgery-tools.ftl b/Resources/Locale/en-US/_Shitmed/surgery/surgery-tools.ftl
deleted file mode 100644
index c1d1f93524a..00000000000
--- a/Resources/Locale/en-US/_Shitmed/surgery/surgery-tools.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-surgery-tool-turn-on = Turn it on first!
-surgery-tool-reload = Reload it first!
-surgery-tool-match-light = Light it first!
-surgery-tool-match-replace = Get a new match!
-
-surgery-tool-examinable-verb-text = Surgery Tool
-surgery-tool-examinable-verb-message = Examine the uses of this tool in surgeries.
-surgery-tool-header = This can be used in surgeries as:
-surgery-tool-unlimited = - {$tool} at [color={$color}]{$speed}x[/color] speed
-surgery-tool-used = - {$tool} at [color={$color}]{$speed}x[/color] speed, [color=red]then gets used up[/color]
diff --git a/Resources/Locale/en-US/_Shitmed/surgery/surgery-ui.ftl b/Resources/Locale/en-US/_Shitmed/surgery/surgery-ui.ftl
deleted file mode 100644
index 415395f7815..00000000000
--- a/Resources/Locale/en-US/_Shitmed/surgery/surgery-ui.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-surgery-verb-text = Start surgery
-surgery-verb-message = Begin surgery on this entity.
-surgery-ui-window-title = Surgery
-surgery-ui-window-require = Requires
-surgery-ui-window-parts = < Parts
-surgery-ui-window-surgeries = < Surgeries
-surgery-ui-window-steps = < Steps
-surgery-ui-window-steps-error-skills = You have no surgical skills.
-surgery-ui-window-steps-error-table = You need an operating table for this.
-surgery-ui-window-steps-error-armor = You need to remove their armor!
-surgery-ui-window-steps-error-tools = Missing tools.
-surgery-error-laying = They need to be laying down!
-surgery-error-self-surgery = You can't perform surgery on yourself!
-surgery-part-damage-evaded = {$user} narrowly evaded!
diff --git a/Resources/Locale/en-US/_Shitmed/technologies/technologies.ftl b/Resources/Locale/en-US/_Shitmed/technologies/technologies.ftl
deleted file mode 100644
index d5db297ae29..00000000000
--- a/Resources/Locale/en-US/_Shitmed/technologies/technologies.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-research-technology-advanced-treatment = Advanced Treatment
-research-technology-high-end-surgery = High End Surgical Tools
-research-technology-cybernetic-enhancements = Cybernetic Enhancements
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_corvaxnext/accent/accents.ftl b/Resources/Locale/en-US/_corvaxnext/accent/accents.ftl
deleted file mode 100644
index 504b08d0194..00000000000
--- a/Resources/Locale/en-US/_corvaxnext/accent/accents.ftl
+++ /dev/null
@@ -1,299 +0,0 @@
-# Gondola
-accent-words-gondola-1 = ...
-
-#Ohio
-accent-ohio-prefix-1 = Gyatt dang,
-accent-ohio-prefix-2 = Chat...
-accent-ohio-prefix-3 = Epic win,
-
-accent-ohio-suffix-1 = . Like in Ohio.
-accent-ohio-suffix-2 = . From Ohio...
-accent-ohio-suffix-3 = . Like in Fortnite.
-accent-ohio-suffix-4 = . Like from Fortnite.
-accent-ohio-suffix-5 = . For the Rizzler.
-accent-ohio-suffix-6 = . Chat is this real?
-accent-ohio-suffix-7 = . Bro knew what he was doing.
-accent-ohio-suffix-8 = . Goofy ahh.
-
-accent-ohio-words-1 = charisma
-accent-ohio-words-replace-1 = rizz
-
-accent-ohio-words-2 = cool
-accent-ohio-words-replace-2 = rizz
-
-accent-ohio-words-3 = amazing
-accent-ohio-words-replace-3 = rizzlike
-
-accent-ohio-words-4 = god
-accent-ohio-words-replace-4 = gyatt
-
-accent-ohio-words-5 = attack
-accent-ohio-words-replace-5 = unalive
-
-accent-ohio-words-6 = kill
-accent-ohio-words-replace-6 = unalive
-
-accent-ohio-words-7 = murder
-accent-ohio-words-replace-7 = unalive
-
-accent-ohio-words-8 = dead
-accent-ohio-words-replace-8 = in ohio
-
-accent-ohio-words-9 = maints
-accent-ohio-words-replace-9 = the backrooms
-
-accent-ohio-words-10 = maintenance
-accent-ohio-words-replace-10 = the backrooms
-
-accent-ohio-words-11 = maint
-accent-ohio-words-replace-11 = the backrooms
-
-accent-ohio-words-12 = attacked
-accent-ohio-words-replace-12 = unalived
-
-accent-ohio-words-13 = nukie
-accent-ohio-words-replace-13 = sussy baka impostor from Among Us
-
-accent-ohio-words-14 = syndicate
-accent-ohio-words-replace-14 = sussy baka impostor from Among Us
-
-accent-ohio-words-15 = syndi
-accent-ohio-words-replace-15 = sussy baka impostor from Among Us
-
-accent-ohio-words-16 = traitor
-accent-ohio-words-replace-16 = sussy baka impostor from Among Us
-
-accent-ohio-words-17 = got
-accent-ohio-words-replace-17 = gyatt
-
-accent-ohio-words-18 = delicious
-accent-ohio-words-replace-18 = bussin'
-
-accent-ohio-words-19 = yummy
-accent-ohio-words-replace-19 = bussin'
-
-accent-ohio-words-20 = women
-accent-ohio-words-replace-20 = FEMALES
-
-accent-ohio-words-21 = girls
-accent-ohio-words-replace-21 = FEMALES
-
-accent-ohio-words-22 = girl
-accent-ohio-words-replace-22 = FEMALE
-
-accent-ohio-words-23 = woman
-accent-ohio-words-replace-23 = FEMALE
-
-accent-ohio-words-24 = miss
-accent-ohio-words-replace-24 = FEMALE
-
-accent-ohio-words-25 = ms
-accent-ohio-words-replace-25 = FEMALE
-
-accent-ohio-words-26 = mrs
-accent-ohio-words-replace-26 = FEMALE
-
-accent-ohio-words-27 = ms.
-accent-ohio-words-replace-27 = FEMALE
-
-accent-ohio-words-28 = mrs.
-accent-ohio-words-replace-28 = FEMALE
-
-accent-ohio-words-29 = bitch
-accent-ohio-words-replace-29 = FEMALE
-
-accent-ohio-words-30 = really
-accent-ohio-words-replace-30 = for real
-
-accent-ohio-words-31 = definitely
-accent-ohio-words-replace-31 = lowkey
-
-accent-ohio-words-32 = mhm
-accent-ohio-words-replace-32 = on god
-
-accent-ohio-words-33 = epic
-accent-ohio-words-replace-33 = poggers
-
-accent-ohio-words-34 = lingium
-accent-ohio-words-replace-34 = ligma
-
-accent-ohio-words-35 = game
-accent-ohio-words-replace-35 = roblox
-
-accent-ohio-words-36 = nah
-accent-ohio-words-replace-36 = cope
-
-accent-ohio-words-37 = weird
-accent-ohio-words-replace-37 = sus
-
-accent-ohio-words-38 = brother
-accent-ohio-words-replace-38 = bro
-
-accent-ohio-words-39 = man
-accent-ohio-words-replace-39 = bro
-
-accent-ohio-words-40 = marijuana
-accent-ohio-words-replace-40 = 420 leaf
-
-accent-ohio-words-41 = weed
-accent-ohio-words-replace-41 = 420 leaf
-
-accent-ohio-words-42 = best
-accent-ohio-words-replace-42 = GOAT
-
-accent-ohio-words-43 = loss
-accent-ohio-words-replace-43 = L
-
-accent-ohio-words-44 = lose
-accent-ohio-words-replace-44 = take an L
-
-accent-ohio-words-45 = lost
-accent-ohio-words-replace-45 = took an L
-
-accent-ohio-words-46 = silly
-accent-ohio-words-replace-46 = goofy ahh
-
-accent-ohio-words-47 = clown
-accent-ohio-words-replace-47 = goofy ahh
-
-accent-ohio-words-48 = funny
-accent-ohio-words-replace-48 = goofy
-
-accent-ohio-words-49 = joke
-accent-ohio-words-replace-49 = meme
-
-accent-ohio-words-50 = idiot
-accent-ohio-words-replace-50 = baka
-
-accent-ohio-words-51 = ugly
-accent-ohio-words-replace-51 = rizzless
-
-accent-ohio-words-52 = smartass
-accent-ohio-words-replace-52 = nerd
-
-accent-ohio-words-53 = smart
-accent-ohio-words-replace-53 = nerdlike
-
-accent-ohio-words-54 = science
-accent-ohio-words-replace-54 = nerdland
-
-accent-ohio-words-55 = scientist
-accent-ohio-words-replace-55 = professional nerd
-
-accent-ohio-words-56 = story
-accent-ohio-words-replace-56 = lorepage
-
-accent-ohio-words-57 = loser
-accent-ohio-words-replace-57 = L + Ratio idiot
-
-accent-ohio-words-58 = nice
-accent-ohio-words-replace-58 = rizzlike
-
-accent-ohio-words-59 = spesos
-accent-ohio-words-replace-59 = rizzbucks
-
-accent-ohio-words-60 = dollars
-accent-ohio-words-replace-60 = rizzbucks
-
-accent-ohio-words-61 = dollar
-accent-ohio-words-replace-61 = rizzbuck
-
-accent-ohio-words-62 = speso
-accent-ohio-words-replace-62 = rizzbuck
-
-accent-ohio-words-63 = money
-accent-ohio-words-replace-63 = rizzbucks
-
-accent-ohio-words-64 = kill you
-accent-ohio-words-replace-64 = send you to Brazil
-
-accent-ohio-words-65 = dick
-accent-ohio-words-replace-65 = glizzy
-
-accent-ohio-words-66 = hot dog
-accent-ohio-words-replace-66 = glizzy
-
-accent-ohio-words-67 = butt
-accent-ohio-words-replace-67 = bussy
-
-accent-ohio-words-68 = bum
-accent-ohio-words-replace-68 = bussy
-
-accent-ohio-words-69 = ass
-accent-ohio-words-replace-69 = bussy
-
-accent-ohio-words-70 = kill yourself
-accent-ohio-words-replace-70 = send yourself to Brazil you stupid rizzless citizen of Ohio
-
-accent-ohio-words-71 = felinid
-accent-ohio-words-replace-71 = hecking chonker
-
-accent-ohio-words-72 = cat
-accent-ohio-words-replace-72 = hecking chonker
-
-accent-ohio-words-73 = kitty
-accent-ohio-words-replace-73 = hecking chonker
-
-accent-ohio-words-74 = ian
-accent-ohio-words-replace-74 = hecking chonker
-
-accent-ohio-words-75 = dog
-accent-ohio-words-replace-75 = hecking chonker
-
-accent-ohio-words-76 = cerberus
-accent-ohio-words-replace-76 = hecking chonker
-
-accent-ohio-words-77 = puppy
-accent-ohio-words-replace-77 = hecking chonker
-
-accent-ohio-words-78 = pup
-accent-ohio-words-replace-78 = hecking chonker
-
-accent-ohio-words-79 = tesla
-accent-ohio-words-replace-79 = sparkly rizzball
-
-accent-ohio-words-80 = singularity
-accent-ohio-words-replace-80 = sussy singuawungoose
-
-accent-ohio-words-81 = singu
-accent-ohio-words-replace-81 = sussy singuawungoose
-
-accent-ohio-words-82 = singulo
-accent-ohio-words-replace-82 = sussy singuawungoose
-
-accent-ohio-words-83 = tesloose
-accent-ohio-words-replace-83 = SPARKLY RIZZBALL LOOSE NO CAP
-
-accent-ohio-words-84 = tesla loose
-accent-ohio-words-replace-84 = SPARKLY RIZZBALL LOOSE NO CAP
-
-accent-ohio-words-85 = hacking
-accent-ohio-words-replace-85 = hacking like in a video game
-
-accent-ohio-words-86 = robust
-accent-ohio-words-replace-86 = cooking
-
-accent-ohio-words-87 = die
-accent-ohio-words-replace-87 = get unalived
-
-accent-ohio-words-88 = died
-accent-ohio-words-replace-88 = was unalived
-
-accent-ohio-words-89 = goddamn
-accent-ohio-words-replace-89 = gyattdamn
-
-accent-ohio-words-90 = godamn
-accent-ohio-words-replace-90 = gyattdamn
-
-accent-ohio-words-91 = goddamned
-accent-ohio-words-replace-91 = gyatdamned
-
-accent-ohio-words-92 = goddang
-accent-ohio-words-replace-92 = gyattdang
-
-accent-ohio-words-93 = fuck
-accent-ohio-words-replace-93 = skibidi
-
-accent-ohio-words-94 = shit
-accent-ohio-words-replace-94 = skibidi
-
diff --git a/Resources/Locale/en-US/_corvaxnext/entities/bodyparts.ftl b/Resources/Locale/en-US/_corvaxnext/entities/bodyparts.ftl
deleted file mode 100644
index 1b679d1e785..00000000000
--- a/Resources/Locale/en-US/_corvaxnext/entities/bodyparts.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-ent-PartMonkey = monkey part
-ent-TorsoMonkey = monkey torso
-ent-HeadMonkey = monkey head
-ent-LeftArmMonkey = monkey left arm
-ent-RightArmMonkey = monkey right arm
-ent-LeftHandMonkey = monkey left hand
-ent-RightHandMonkey = monkey right hand
-ent-LeftLegMonkey = monkey left leg
-ent-RightLegMonkey = monkey right leg
-ent-LeftFootMonkey = monkey left foot
-ent-RightFootMonkey = monkey right foot
-
-ent-PartKobold = kobold part
-ent-TorsoKobold = kobold torso
-ent-HeadKobold = kobold head
-ent-LeftArmKobold = kobold left arm
-ent-RightArmKobold = kobold right arm
-ent-LeftHandKobold = kobold left hand
-ent-RightHandKobold = kobold right hand
-ent-LeftLegKobold = kobold left leg
-ent-RightLegKobold = kobold right leg
-ent-LeftFootKobold = kobold left foot
-ent-RightFootKobold = kobold right foot
-
-ent-OrganAnimalBrain = animal brain
-ent-OrganAnimalEyes = animal eyes
diff --git a/Resources/Locale/en-US/_corvaxnext/guidebook/guides.ftl b/Resources/Locale/en-US/_corvaxnext/guidebook/guides.ftl
deleted file mode 100644
index 217d0bfacc7..00000000000
--- a/Resources/Locale/en-US/_corvaxnext/guidebook/guides.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-guide-entry-surgery = Surgery
-guide-entry-partmanipulation = Part Manipulation
-guide-entry-organmanipulation = Organ Manipulation
-guide-entry-utilitysurgeries = Utility Surgeries
diff --git a/Resources/Locale/en-US/_corvaxnext/job/job-description.ftl b/Resources/Locale/en-US/_corvaxnext/job/job-description.ftl
deleted file mode 100644
index a2e0ddcd7ed..00000000000
--- a/Resources/Locale/en-US/_corvaxnext/job/job-description.ftl
+++ /dev/null
@@ -1 +0,0 @@
-job-description-surgeon = Masterfully shove the scalpel deep into the poor souls who come... Saving lives, of course!
diff --git a/Resources/Locale/en-US/_corvaxnext/job/job-names.ftl b/Resources/Locale/en-US/_corvaxnext/job/job-names.ftl
deleted file mode 100644
index 96606e797ad..00000000000
--- a/Resources/Locale/en-US/_corvaxnext/job/job-names.ftl
+++ /dev/null
@@ -1 +0,0 @@
-job-name-surgeon = surgeon
diff --git a/Resources/Locale/en-US/_corvaxnext/species/species.ftl b/Resources/Locale/en-US/_corvaxnext/species/species.ftl
deleted file mode 100644
index 72a9b48f10e..00000000000
--- a/Resources/Locale/en-US/_corvaxnext/species/species.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-species-name-monkey = Monkey
-species-name-kobold = Kobold
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index ed4ef4b05ef..c5ac721e589 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -113,7 +113,6 @@ ui-options-header-camera = Camera
 ui-options-header-interaction-basic = Basic Interaction
 ui-options-header-interaction-adv = Advanced Interaction
 ui-options-header-ui = User Interface
-ui-options-header-targeting = Targeting
 ui-options-header-misc = Miscellaneous
 ui-options-header-hotbar = Hotbar
 ui-options-header-shuttle = Shuttle
@@ -166,13 +165,6 @@ ui-options-function-rotate-object-clockwise = Rotate clockwise
 ui-options-function-rotate-object-counterclockwise = Rotate counterclockwise
 ui-options-function-flip-object = Flip
 
-ui-options-function-target-head = Target head
-ui-options-function-target-torso = Target torso
-ui-options-function-target-left-arm = Target left arm
-ui-options-function-target-right-arm = Target right arm
-ui-options-function-target-left-leg = Target left leg
-ui-options-function-target-right-leg = Target right leg
-
 ui-options-function-focus-chat-input-window = Focus chat
 ui-options-function-focus-local-chat-window = Focus chat (IC)
 ui-options-function-focus-emote = Focus chat (Emote)
diff --git a/Resources/Locale/en-US/mood/mood-alerts.ftl b/Resources/Locale/en-US/mood/mood-alerts.ftl
deleted file mode 100644
index c5f76c5fb83..00000000000
--- a/Resources/Locale/en-US/mood/mood-alerts.ftl
+++ /dev/null
@@ -1,32 +0,0 @@
-alerts-mood-dead-name = Dead
-alerts-mood-dead-desc = Eternal emptiness has enveloped me, and the world no longer has power over my soul.
-
-alerts-mood-insane-name = Insane
-alerts-mood-insane-desc = Darkness and hopelessness smolder in my soul, the world is doomed to absolute evil.
-
-alerts-mood-horrible-name = Horrible
-alerts-mood-horrible-desc = I struggle with pain and fears, my fate is a series of torments and sufferings.
-
-alerts-mood-terrible-name = Terrible
-alerts-mood-terrible-desc = My life has dried up like blood from a wound, and there is only darkness and despair all around.
-
-alerts-mood-bad-name = Bad
-alerts-mood-bad-desc = My strength is leaving me, and every day becomes a difficult ordeal.
-
-alerts-mood-meh-name = Mediocre
-alerts-mood-meh-desc = The world is full of dangers and pain, and my hopes are slowly dying.
-
-alerts-mood-neutral-name = Neutral
-alerts-mood-neutral-desc = I continue on my way, despite threats and hardships, looking for the slightest light in the darkness.
-
-alerts-mood-good-name = Good
-alerts-mood-good-desc = In this world of suffering, I find a little relief and hope.
-
-alerts-mood-great-name = Great
-alerts-mood-great-desc = My strength is restored, and the world seems to be the lesser evil and pain.
-
-alerts-mood-exceptional-name = Exceptional
-alerts-mood-exceptional-desc = Strength and hope fills me, despite the threats that lurk around me.
-
-alerts-mood-perfect-name = Perfect
-alerts-mood-perfect-desc = My soul is full of light and power, and I am ready to fight the darkness in this cruel world.
diff --git a/Resources/Locale/en-US/mood/mood.ftl b/Resources/Locale/en-US/mood/mood.ftl
deleted file mode 100644
index c12ec7246ec..00000000000
--- a/Resources/Locale/en-US/mood/mood.ftl
+++ /dev/null
@@ -1,54 +0,0 @@
-mood-show-effects-start = [font size=12]Mood:[/font]
-
-mood-effect-HungerOverfed = I ate so much, I feel as though I'm about to burst!
-mood-effect-HungerOkay = I am feeling full.
-mood-effect-HungerPeckish = I could go for a snack right about now.
-mood-effect-HungerStarving = I NEED FOOD!
-
-mood-effect-ThirstOverHydrated = I feel dizzy after drinking too much.
-mood-effect-ThirstOkay = I'm feeling refreshed.
-mood-effect-ThirstThirsty = My lips are a little dry.
-mood-effect-ThirstParched = I NEED WATER!
-
-mood-effect-HealthNoDamage = I'm in no pain.
-mood-effect-HealthLightDamage = It's just a scratch, but it hurts nonetheless
-mood-effect-HealthSevereDamage = The pain is almost unbearable!
-mood-effect-HealthHeavyDamage = Agony gnaws at my soul!
-
-mood-effect-Handcuffed = I am being held captive.
-
-mood-effect-Suffocating = I.. Can't.. Breathe...
-
-mood-effect-OnFire = IT BURNS!!!
-
-mood-effect-Creampied = I was baptized. It tastes like pie.
-
-mood-effect-MobSlipped = I slipped! I should be more careful next time.
-
-mood-effect-MobVomit = My lunch tasted awful coming back up.
-
-mood-effect-MobLowPressure = My whole body feels like it's going to burst!
-
-mood-effect-MobHighPressure = I feel as though I am being crushed on all sides!
-
-mood-effect-TraitSaturnine = Everything kind of sucks. I hate this job.
-
-mood-effect-Dead = You are dead.
-
-mood-effect-BeingHugged = Hugs are nice.
-
-mood-effect-ArcadePlay = I had fun playing an interesting arcade game.
-
-mood-effect-GotBlessed = I was blessed.
-
-mood-effect-PetAnimal = Animals are so cute, I can't stop petting them!
-
-mood-effect-SavedLife = It's so nice to save someone's life
-
-mood-effect-TraitorFocused = I have a goal, and I will accomplish it no matter what.
-
-mood-effect-RevolutionFocused = VIVA LA REVOLUTION!!!
-
-mood-effect-CultFocused = Dark Gods, grant me strength!
-
-mood-effect-TraitSanguine = I have nothing to worry about. I'm sure everything will turn out well in the end!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
index a55d5dd08ac..2e3c02c9f6d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
@@ -1,4 +1,2 @@
 ent-SpawnPointPilot = pilot
     .desc = { ent-SpawnPointJobBase.desc }
-ent-SpawnPointSurgeon = surgeon
-    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Locale/ru-RU/_corvaxnext/entities/bodyparts.ftl b/Resources/Locale/ru-RU/_corvaxnext/entities/bodyparts.ftl
deleted file mode 100644
index 5a148ad0391..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/entities/bodyparts.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-ent-PartMonkey = часть обезьяны
-ent-TorsoMonkey = торс обезьяны
-ent-HeadMonkey = голова обезьяны
-ent-LeftArmMonkey = левая рука обезьяны
-ent-RightArmMonkey = правая рука обезьяны
-ent-LeftHandMonkey = левая ладонь обезьяны
-ent-RightHandMonkey = правая ладонь обезьяны
-ent-LeftLegMonkey = левая нога обезьяны
-ent-RightLegMonkey = правая нога обезьяны
-ent-LeftFootMonkey = левая стопа обезьяны
-ent-RightFootMonkey = правая стопа обезьяны
-
-ent-PartKobold = часть кобольда
-ent-TorsoKobold = торс кобольда
-ent-HeadKobold = голова кобольда
-ent-LeftArmKobold = левая рука кобольда
-ent-RightArmKobold = правая рука кобольда
-ent-LeftHandKobold = левая ладонь кобольда
-ent-RightHandKobold = правая ладонь кобольда
-ent-LeftLegKobold = левая нога кобольда
-ent-RightLegKobold = правая нога кобольда
-ent-LeftFootKobold = левая стопа кобольда
-ent-RightFootKobold = правая стопа кобольда
-
-ent-OrganAnimalBrain = мозг животного
-ent-OrganAnimalEyes = глаза животного
diff --git a/Resources/Locale/ru-RU/_corvaxnext/guidebook/guides.ftl b/Resources/Locale/ru-RU/_corvaxnext/guidebook/guides.ftl
deleted file mode 100644
index f25aefc662f..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/guidebook/guides.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-guide-entry-surgery = Хирургия
-guide-entry-partmanipulation = Манипулирование конечностями
-guide-entry-organmanipulation = Манипулирование органами
-guide-entry-utilitysurgeries = Особые применения
diff --git a/Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl b/Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl
deleted file mode 100644
index 6cbc0ca3451..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl
+++ /dev/null
@@ -1 +0,0 @@
-job-description-surgeon = Мастерски пихайте скальпель куда поглубже приходящим бедолагам... Спасая жизни, конечно!
diff --git a/Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl b/Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl
deleted file mode 100644
index 020503c7fca..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-job-name-surgeon = хирург
-JobSurgeon = хирург
diff --git a/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl
index 5648702c453..6c6a70d1736 100644
--- a/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl
+++ b/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl
@@ -3,8 +3,3 @@ loadout-group-brigmedic-head = Бригмедик, голова
 loadout-group-brigmedic-jumpsuit = Бригмедик, комбинезон
 loadout-group-brigmedic-backpack = Бригмедик, верхняя одежда
 loadout-group-brigmedic-outerclothing = Бригмедик, рюкзак
-
-# Medical
-loadout-group-surgeon-head = Хирург, голова
-loadout-group-surgeon-jumpsuit = Хирург, комбинезон
-loadout-group-surgeon-scalpel = Хирург, скальпель
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/devices/pda.ftl
deleted file mode 100644
index cc737ac199f..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/devices/pda.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-SurgeonPDA = КПК хирурга
-    .desc = { ent-MedicalPDA.desc }
diff --git a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/misc/identification_cards.ftl
deleted file mode 100644
index c3c06ff0b60..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/prototypes/entities/objects/misc/identification_cards.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-SurgeonIDCard = ID карта хирурга
-    .desc = { ent-IDCardStandard.desc }
diff --git a/Resources/Locale/ru-RU/_corvaxnext/species/species.ftl b/Resources/Locale/ru-RU/_corvaxnext/species/species.ftl
deleted file mode 100644
index 1a3dd5ff7b0..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/species/species.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-species-name-monkey = Обезьяна
-species-name-kobold = Кобольд
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-borg-modules.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-borg-modules.ftl
deleted file mode 100644
index 94c024c89be..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-borg-modules.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-BorgModuleSurgery = модуль хирургического киборга
-
-ent-BorgModuleAdvancedSurgery = модуль продвинутого хирургического киборга
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-cybernetic-items.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-cybernetic-items.ftl
deleted file mode 100644
index 0fa549a37fb..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-cybernetic-items.ftl
+++ /dev/null
@@ -1,48 +0,0 @@
-## Organs
-
-ent-BasicCyberneticEyes = базовые кибернетические глаза
-    .desc = Пара кибернетических глаз, усиливающих ваше зрение и защищающих от повреждений глаз.
-
-ent-SecurityCyberneticEyes = кибернетические глаза безопасности
-    .desc = Пара кибернетических глаз, усиливающих ваше зрение, с встроенной системой SecHUD.
-
-ent-MedicalCyberneticEyes = кибернетические диагностические глаза
-    .desc = Пара кибернетических глаз, усиливающих ваше зрение, с встроенной системой MedHUD.
-
-## Body parts
-
-ent-LeftArmCybernetic = кибернетическая левая рука
-    .desc = Кибернетическая левая рука, выполненная из материала на основе кремния.
-
-ent-RightArmCybernetic = кибернетическая правая рука
-    .desc = Кибернетическая правая рука, выполненная из материала на основе кремния.
-
-ent-LeftLegCybernetic = кибернетическая левая нога
-    .desc = Кибернетическая левая нога, выполненная из материала на основе кремния.
-
-ent-RightLegCybernetic = кибернетическая правая нога
-    .desc = Кибернетическая правая нога, выполненная из материала на основе кремния.
-
-ent-LeftHandCybernetic = кибернетическая левая кисть
-    .desc = Кибернетическая левая кисть, выполненная из материала на основе кремния.
-
-ent-RightHandCybernetic = кибернетическая правая кисть
-    .desc = Кибернетическая правая кисть, выполненная из материала на основе кремния.
-
-ent-LeftFootCybernetic = кибернетическая левая стопа
-    .desc = Кибернетическая левая стопа, выполненная из материала на основе кремния.
-
-ent-RightFootCybernetic = кибернетическая правая стопа
-    .desc = Кибернетическая правая стопа, выполненная из материала на основе кремния.
-
-ent-JawsOfLifeLeftArm = левая рука "Челюсти Жизни"
-    .desc = Кибернетическая левая рука с возможностью вскрытия дверей.
-
-ent-JawsOfLifeRightArm = правая рука "Челюсти Жизни"
-    .desc = Кибернетическая правая рука с возможностью вскрытия дверей.
-
-ent-SpeedLeftLeg = левая нога "Б.Е.Г.И"
-    .desc = Кибернетическая левая нога, позволяющая своему владельцу бегать быстрее.
-
-ent-SpeedRightLeg = правая нога "Б.Е.Г.И"
-    .desc =Кибернетическая правая нога, позволяющая своему владельцу бегать быстрее.
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-items.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-items.ftl
deleted file mode 100644
index 0945fbe1c82..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-items.ftl
+++ /dev/null
@@ -1,48 +0,0 @@
-ent-MedicalBiofabricator = медицинский биофабрикатор
-    .desc = Производит искусственные органы, которые могут быть установлены пациентам. Потребляет биомассу.
-
-ent-BioSynthHeart = био-синтетическое сердце
-    .desc = Искуственное сердце, которое может устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthLiver = био-синтетическая печень
-    .desc = Искуственная печень, которая может устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthLungs = био-синтетические лёгкие
-    .desc = Искуственные лёгкие, которые могут устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthEyes = био-синтетические глаза
-    .desc = Искуственные глаза, которые могут устанавливаться и адаптироваться к любому живому организму.
-
-ent-BioSynthLeftArm = био-синтетическая левая рука
-    .desc = Искуственная рука, которая может устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthRightArm = био-синтетическая правая рука
-    .desc = Искуственная рука, которая может устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthLeftHand = био-синтетическая левая ладонь
-    .desc = Искуственная ладонь, которая может устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthRightHand = био-синтетическая правая ладонь
-    .desc = Искуственная ладонь, которая может устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthLeftLeg = био-синтетическая левая нога
-    .desc = Искуственная нога, которая может устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthRightLeg = био-синтетическая правая нога
-    .desc = Искуственная нога, которая может устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthLeftFoot = био-синтетическая левая стопа
-    .desc = Искуственная стопа, которая может устанавливаться и адаптироваться к любому живому организму.
-ent-BioSynthRightFoot = био-синтетическая правая стопа
-    .desc = Искуственная стопа, которая может устанавливаться и адаптироваться к любому живому организму.
-
-ent-MedicalBiofabMachineBoard = медицинский биофабрикатор (машинная плата)
-    .desc = Машинная плата, необходимая для создания медицинского биофабрикатора.
-ent-BoneGel = бутылка костяного геля
-    .desc = Контейнер для костяного геля, нужно время от времени пополнять в специальной машине.
-
-ent-OrganSpaceAnimalLungs = космические лёгкие
-ent-OrganSpaceAnimalHeart = космическое сердце
-
-ent-TorsoCarp = туловище карпа
-ent-TailCarp = плавник карпа
-
-ent-EnergyCautery = энергетический прибор для прижигания
-    .desc = Энергетический хирургический инструмент, используемый для прижигания открытых ран, также служит дрелью в активированном состоянии.
-ent-EnergyScalpel = энергетический скальпель
-    .desc = Скальпель с энергетическим лезвием, также служит пилой в активированном состоянии.
-ent-AdvancedRetractor = продвинутый ретрактор
-    .desc = Ретрактор с механическими зажимами, также служит гемостатом в активированном состоянии.
-ent-OmnimedTool = медицинский мультитул
-    .desc = Вершина хирургических инструментов, способен выполнять различные медицинские операции, объединяя функции всех хирургических инструментов.
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-operations.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-operations.ftl
deleted file mode 100644
index fc9b37bd291..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-operations.ftl
+++ /dev/null
@@ -1,65 +0,0 @@
-ent-SurgeryStepOpenIncisionScalpel = Порезать при помощи скальпеля
-ent-SurgeryStepClampBleeders = Остановить внешнее кровотечение
-ent-SurgeryStepRetractSkin = Втянуть кожу
-ent-SurgeryStepSawBones = Пропилить кость
-ent-SurgeryStepPriseOpenBones = Вскрыть кость
-ent-SurgeryStepCloseBones = Закрыть кость
-ent-SurgeryStepMendRibcage = Восстановить кость
-ent-SurgeryStepCloseIncision = Закрыть разрез
-
-ent-SurgeryStepInsertFeature = Прикрепить часть тела
-ent-SurgeryStepSealWounds = Прижечь раны
-ent-SurgeryStepSawFeature = Пропилить через кость
-ent-SurgeryStepClampInternalBleeders = Остановить внутреннее кровотечение
-ent-SurgeryStepRemoveFeature = Ампутировать часть тела
-
-ent-SurgeryStepCarefulIncisionScalpel = Сделать аккуратный разрез
-ent-SurgeryStepRepairBruteTissue = Восстановить механически поврежденную ткань
-ent-SurgeryStepRepairBurnTissue = Восстановить термически поврежденную ткань
-ent-SurgeryStepSealTendWound = Прижечь кровотечение
-
-ent-SurgeryStepInsertItem = Вставить предмет в полость
-ent-SurgeryStepRemoveItem = Достать предмет из полости
-
-ent-SurgeryStepRemoveOrgan = Удалить орган
-ent-SurgeryStepInsertOrgan = Вставить орган
-ent-SurgeryStepInsertLungs = Вставить лёгкие
-ent-SurgeryStepInsertLiver = Вставить печень
-ent-SurgeryStepInsertEyes = Вставить глаза
-ent-SurgeryStepInsertHeart = Вставить сердце
-
-
-ent-SurgeryOpenIncision = Открыть разрез
-ent-SurgeryCloseIncision = Закрыть разрез
-ent-SurgeryOpenRibcage = Открыть грудную клетку
-ent-SurgeryRemovePart = Удалить часть тела
-
-ent-SurgeryAttachHead = Прикрепить голову
-ent-SurgeryAttachLeftArm = Прикрепить левую руку
-ent-SurgeryAttachRightArm = Прикрепить правую руку
-ent-SurgeryAttachLeftLeg = Прикрепить левую ногу
-ent-SurgeryAttachRightLeg = Прикрепить правую ногу
-ent-SurgeryAttachLeftHand = Прикрепить левую ладонь
-ent-SurgeryAttachRightHand = Прикрепить правую ладонь
-ent-SurgeryAttachLeftFoot = Прикрепить левую стопу
-ent-SurgeryAttachRightFoot = Прикрепить правую стопу
-ent-SurgeryAttachTail = Прикрепить хвост
-
-ent-SurgeryTendWoundsBrute = Восстановить механические повреждения
-ent-SurgeryTendWoundsBurn = Восстановить термические повреждения
-
-ent-SurgeryInsertItem = Вставить предмет
-
-ent-SurgeryRemoveBrain = Удалить мозг
-ent-SurgeryInsertBrain = Вставить мозг
-ent-SurgeryRemoveHeart = Удалить сердце
-ent-SurgeryInsertHeart = Вставить сердце
-ent-SurgeryRemoveLiver = Удалить печень
-ent-SurgeryInsertLiver = Вставить печень
-ent-SurgeryRemoveLungs = Удалить лёгкие
-ent-SurgeryInsertLungs = Вставить лёгкие
-ent-SurgeryRemoveStomach = Удалить желудок
-ent-SurgeryInsertStomach = Вставить желудок
-ent-SurgeryRemoveEyes = Удалить глаза
-ent-SurgeryInsertEyes = Вставить глаза
-ent-SurgeryLobotomize = Лоботомировать
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-popup.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-popup.ftl
deleted file mode 100644
index 9e7acedc0b2..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-popup.ftl
+++ /dev/null
@@ -1,53 +0,0 @@
-surgery-popup-step-SurgeryStepOpenIncisionScalpel = {$user} делает разрез на {$part} {$target}.
-surgery-popup-step-SurgeryStepClampBleeders = {$user} пережимает внутреннее кровотечение на {$part} {$target}.
-surgery-popup-step-SurgeryStepRetractSkin = {$user} втягивает кожу на {$part} {$target}.
-surgery-popup-step-SurgeryStepSawBones = {$user} пилит через кости на {$part} {$target}.
-surgery-popup-step-SurgeryStepPriseOpenBones = {$user} вскрывает кости на {$part} {$target}.
-surgery-popup-step-SurgeryStepCloseBones = {$user} закрывает кости на {$part} {$target}.
-surgery-popup-step-SurgeryStepMendRibcage = {$user} лечит грудную клетку на {$part} {$target}.
-surgery-popup-step-SurgeryStepCloseIncision = {$user} закрывает разрез на {$part} {$target}.
-
-surgery-popup-step-SurgeryStepInsertFeature = {$user} вставляет что-то в {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachHead-step-SurgeryStepInsertFeature = {$user} присоединяет голову к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachLeftArm-step-SurgeryStepInsertFeature = {$user} присоединяет левую руку к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachRightArm-step-SurgeryStepInsertFeature = {$user} присоединяет правую руку к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachLeftLeg-step-SurgeryStepInsertFeature = {$user} присоединяет левую ногу к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachRightLeg-step-SurgeryStepInsertFeature = {$user}присоединяет правую ногу к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachLeftHand-step-SurgeryStepInsertFeature = {$user} присоединяет левую ладонь к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachRightHand-step-SurgeryStepInsertFeature = {$user} присоединяет правую ногу к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachLeftFoot-step-SurgeryStepInsertFeature = {$user} присоединяет левую стопу к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachRightFoot-step-SurgeryStepInsertFeature = {$user} присоединяет правую стопу к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachLegs-step-SurgeryStepInsertFeature = {$user} присоединяет ноги к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachHands-step-SurgeryStepInsertFeature = {$user} присоединяет руки к {$part} {$target}!
-surgery-popup-procedure-SurgeryAttachFeet-step-SurgeryStepInsertFeature = {$user} присоединяет стопы к {$part} {$target}!
-
-surgery-popup-step-SurgeryStepSealWounds = {$user} лечит раны на {$part} {$target}.
-surgery-popup-step-SurgeryStepSawFeature = {$user} пилит через кости на {$part} {$target}.
-surgery-popup-step-SurgeryStepClampInternalBleeders = {$user} пережимает внутреннее кровотечение у {$part} {$target}.
-surgery-popup-step-SurgeryStepRemoveFeature = {$user} ампутирует {$part} {$target}!
-surgery-popup-step-SurgeryStepCarefulIncisionScalpel = {$user} аккуратно закрывает разрез на {$part} {$target}.
-surgery-popup-step-SurgeryStepRepairBruteTissue = {$user} лечит механические повреждения на {$part} {$target}!
-surgery-popup-step-SurgeryStepRepairBurnTissue = {$user} лечит физические повреждения на {$part} {$target}!
-surgery-popup-step-SurgeryStepSealTendWound = {$user} закрывает раны на {$part} {$target}.
-surgery-popup-step-SurgeryStepInsertItem = {$user} вставляет что-то в {$part} {$target}!
-surgery-popup-step-SurgeryStepRemoveItem = {$user} достаёт что-то из {$part} {$target}!
-
-surgery-popup-step-SurgeryStepRemoveOrgan = {$user} удаляет орган из {$part} {$target}!
-surgery-popup-step-SurgeryStepInsertOrgan = {$user} вставляет орган в {$part} {$target}!
-
-surgery-popup-procedure-SurgeryRemoveBrain-step-SurgeryStepRemoveOrgan = {$user} удаляет мозг из {$part} {$target}!
-surgery-popup-procedure-SurgeryRemoveHeart-step-SurgeryStepRemoveOrgan = {$user} удаляет сердце из {$part} {$target}!
-surgery-popup-procedure-SurgeryRemoveLiver-step-SurgeryStepRemoveOrgan = {$user} удаляет печень из {$part} {$target}!
-surgery-popup-procedure-SurgeryRemoveLungs-step-SurgeryStepRemoveOrgan = {$user} удаляет лёгкие из {$part} {$target}!
-surgery-popup-procedure-SurgeryRemoveEyes-step-SurgeryStepRemoveOrgan = {$user} удаляет глаза из {$part} {$target}!
-surgery-popup-procedure-SurgeryRemoveStomach-step-SurgeryStepRemoveOrgan = {$user} удаляет желудок из {$part} {$target}!
-
-surgery-popup-procedure-SurgeryInsertBrain-step-SurgeryStepInsertOrgan = {$user} вставляет мозг в {$part} {$target}!
-surgery-popup-step-SurgeryStepInsertLungs = {$user} вставляет лёгкие в {$part} {$target}!
-surgery-popup-step-SurgeryStepInsertLiver = {$user} вставляет печень в {$part} {$target}!
-surgery-popup-step-SurgeryStepInsertEyes = {$user} вставляет глаза в {$part} {$target}!
-surgery-popup-step-SurgeryStepInsertHeart = {$user} вставляет сердце в {$part} {$target}!
-surgery-popup-step-SurgeryStepInsertStomach = {$user} вставляет желудок в {$part} {$target}!
-
-surgery-popup-step-SurgeryStepSealOrganWound = {$user} лечит раны на {$part} {$target}.
-surgery-popup-step-SurgeryStepLobotomize = {$user} выполняет трепанацию на {$target} {$part}.
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-ui.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-ui.ftl
deleted file mode 100644
index d1a9e6e9e95..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-ui.ftl
+++ /dev/null
@@ -1,20 +0,0 @@
-ui-options-function-target-head = Прицелиться на голову
-ui-options-function-target-torso = Прицелиться на тело
-ui-options-function-target-left-arm = Прицелиться на левую руку
-ui-options-function-target-right-arm = Прицелиться на правую руку
-ui-options-function-target-left-leg = Прицелиться на левую ногу
-ui-options-function-target-right-leg = Прицелиться на правую ногу
-ui-options-header-targeting = Прицеливание
-
-surgery-ui-window-title = Хирургия
-surgery-ui-window-require = Требуется
-surgery-ui-window-parts = Части
-surgery-ui-window-surgeries = Операции
-surgery-ui-window-steps = Шаги
-
-surgery-ui-window-steps-error-skills = Не хватает навыка для операции!
-surgery-ui-window-steps-error-table = Требуется операционный стол!
-surgery-ui-window-steps-error-armor = Нужно снять с этого броню!
-surgery-ui-window-steps-error-tools = Не хватает инструментов!
-surgery-error-laying = Оно должно быть в положении лёжа!
-surgery-error-self-surgery = Вы не можете оперировать самого себя!
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/technologies.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/technologies.ftl
deleted file mode 100644
index 6199e442df0..00000000000
--- a/Resources/Locale/ru-RU/_corvaxnext/surgery/technologies.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-research-technology-advanced-treatment = Продвинутое лечение
-research-technology-high-end-surgery = Передовые хирургические инструменты
-research-technology-cybernetic-enhancements = Кибернетические протезы
diff --git a/Resources/Locale/ru-RU/backmen/mood/mood-alerts.ftl b/Resources/Locale/ru-RU/backmen/mood/mood-alerts.ftl
deleted file mode 100644
index e96fb1f09f5..00000000000
--- a/Resources/Locale/ru-RU/backmen/mood/mood-alerts.ftl
+++ /dev/null
@@ -1,22 +0,0 @@
-alerts-mood-insane-name = Безумие
-alerts-mood-insane-desc = В моей душе тлеют мрак и безнадежность, мир обречен на абсолютное зло.
-alerts-mood-horrible-name = Печально
-alerts-mood-horrible-desc = Я борюсь с болями и страхами, моя судьба - череда мучений и страданий.
-alerts-mood-terrible-name = Очень плохо
-alerts-mood-terrible-desc = Моя жизнь иссякла, как кровь из раны, и вокруг лишь мрак и отчаяние.
-alerts-mood-bad-name = Плохо
-alerts-mood-bad-desc = Силы покидают меня, и каждый день становится тяжелым испытанием.
-alerts-mood-meh-name = Нехорошо
-alerts-mood-meh-desc = Мир полон угроз и боли, и мои надежды медленно умирают.
-alerts-mood-neutral-name = Нормально
-alerts-mood-neutral-desc = Я продолжаю свой путь, несмотря на угрозы и лишения, ища хоть малейший свет во мраке.
-alerts-mood-good-name = Неплохо
-alerts-mood-good-desc = В этом мире полном страданий, я обретаю небольшое облегчение и надежду.
-alerts-mood-great-name = Хорошо
-alerts-mood-great-desc = Моя сила восстанавливается, и мир кажется меньшим злом и болью.
-alerts-mood-exceptional-name = Очень хорошо
-alerts-mood-exceptional-desc = Я ощущаю в себе силы и надежду на лучшие дни, несмотря на угрозы, что таятся вокруг.
-alerts-mood-perfect-name = Великолепно
-alerts-mood-perfect-desc = Моя душа полна света и силы, и я готов сразиться с тьмой в этом жестоком мире.
-alerts-mood-dead-name = Мёртв
-alerts-mood-dead-desc = Вечная пустота окутала меня, и мир больше не имеет власти над моей душой.
diff --git a/Resources/Locale/ru-RU/backmen/mood/mood-component.ftl b/Resources/Locale/ru-RU/backmen/mood/mood-component.ftl
deleted file mode 100644
index 3a80f507c81..00000000000
--- a/Resources/Locale/ru-RU/backmen/mood/mood-component.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-mood-component-examine = { CAPITALIZE(SUBJECT($user)) } в { $mood } настроении.
-
-mood-examine-horrible = ужасном
-mood-examine-bad = плохом
-mood-examine-neutral = нейтральном
-mood-examine-good = хорошем
-mood-examine-perfect = отличном
diff --git a/Resources/Locale/ru-RU/backmen/mood/mood.ftl b/Resources/Locale/ru-RU/backmen/mood/mood.ftl
deleted file mode 100644
index f1bef5700c8..00000000000
--- a/Resources/Locale/ru-RU/backmen/mood/mood.ftl
+++ /dev/null
@@ -1,70 +0,0 @@
-mood-show-effects-start = [font size=12]Настроение:[/font]
-
-mood-effect-HungerOverfed = Я съел очень много еды, будто вот-вот лопну!
-mood-effect-HungerOkay = Я чувствую себя сытым.
-mood-effect-HungerPeckish = Было бы неплохо немного перекусить.
-mood-effect-HungerStarving = МНЕ НУЖНА ЕДА!
-
-mood-effect-ThirstOverHydrated = Я плохо себя чувствую из-за того что много выпил.
-mood-effect-ThirstOkay = Я чувствую себя свежо.
-mood-effect-ThirstThirsty = Мои губы немного сухие.
-mood-effect-ThirstParched = МНЕ НУЖНА ВОДА!
-
-mood-effect-HealthNoDamage = Я не чувствую никакой боли.
-mood-effect-HealthLightDamage = Небольшая царапина, мне не так уж и больно.
-mood-effect-HealthSevereDamage = Я не могу стерпеть эту боль!
-mood-effect-HealthHeavyDamage = Агония захватывает мою душу!
-
-mood-effect-Handcuffed = Меня держат в наручниках.
-
-mood-effect-Suffocating = Я.. не могу.. дышать...
-
-mood-effect-OnFire = Я ГОРЮ!!!
-
-mood-effect-Creampied = В моё лицо прилетел пирог. На вкус как крем.
-
-mood-effect-MobSlipped = Я поскользнулся! Стоит быть осторожнее в следующий раз.
-
-mood-effect-MobVomit = Мой обед вышел наружу отвратительным путём...
-
-mood-effect-MobLowPressure = Я чувствую будто все мое тело вот-вот лопнет!
-
-mood-effect-MobHighPressure = Я чувствую будто воздух сжимает меня!
-
-mood-effect-TraitSaturnine = Тут всё очень скучное. Ненавижу эту работу.
-
-mood-effect-TraitFortitude = Мне уже на всё плевать.
-
-mood-effect-Dead = Вы мертвы.
-
-mood-effect-BeingHugged = Люблю когда меня обнимают.
-
-mood-effect-ArcadePlay = Я повеселился поиграв в аркадную игру.
-
-mood-effect-WokeUp = Я проснулся после неплохого сна.
-
-mood-effect-GotBlessed = Меня благословили.
-
-mood-effect-PetAnimal = Животные такие милые, не могу перестать их гладить!
-
-mood-effect-SavedLife = Так хорошо спасать чужие жизни.
-
-mood-effect-GotSavedLife = Мою жизнь спасли! Моя вера в людей стала крепче!
-
-mood-effect-TraitorFocused = У меня есть цель, я должен выполнить её ни смотря ни на что.
-
-mood-effect-RevolutionFocused = VIVA LA REVOLUTION!!!
-
-mood-effect-NukeopsFocused = Я должен взорвать станцию любой ценой, даже ценой своей жизни.
-
-mood-effect-CultFocused = Боги тьмы, дайте мне сил!
-
-mood-effect-TraitSanguine = Думаю мне не о чем волноваться. Я обязательно справлюсь!
-
-mood-effect-SurgeryNoLeg = Я не чувствую своей ноги!
-
-mood-effect-SurgeryNoHand = Я не чувствую своей руки!
-
-mood-effect-SurgeryNoTorso = Я не чувствую своего тела!
-
-mood-effect-SurgeryPain = В моём теле проводят операцию, я чувствую сильнейшую боль!
diff --git a/Resources/Locale/ru-RU/backmen/trait/Mood.ftl b/Resources/Locale/ru-RU/backmen/trait/Mood.ftl
deleted file mode 100644
index 29e29f14871..00000000000
--- a/Resources/Locale/ru-RU/backmen/trait/Mood.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-trait-category-mood = Настроение
-
-trait-fortitude-name = Моральная стойкость
-trait-fortitude-desc = Вы не такой эмоциональный человек как остальные, вам плевать на все трудности и радости жизни.
-
-trait-hypomania-name = Гипомания
-trait-hypomania-desc = Обычно вам чертвоски весело, но любой негатив вас сильно расстраивает!
-
-trait-depression-name = Депрессия
-trait-depression-desc = Чувак, эта вечеринка отстой. Я, блин, ненавижу этих людей.
diff --git a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl
index d3b8cbbcb05..170ad03e240 100644
--- a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl
+++ b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl
@@ -12,7 +12,7 @@ health-analyzer-window-entity-damage-total-text = Общие поврежден
 health-analyzer-window-damage-group-text = { $damageGroup }: { $amount }
 health-analyzer-window-damage-type-text = { $damageType }: { $amount }
 health-analyzer-window-entity-unrevivable-text = [color=red]Обнаружено уникальное строение тела! Пациент не может быть реанимирован стандартными средствами![/color]
-health-analyzer-window-entity-bleeding-text = У пациента кровотечение!
+health-analyzer-window-entity-bleeding-text = [color=red]У пациента кровотечение![/color]
 health-analyzer-window-scan-mode-text = Режим сканирования:
 health-analyzer-window-scan-mode-active = АКТИВЕН
 health-analyzer-window-scan-mode-inactive = НЕАКТИВЕН
diff --git a/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl b/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl
index 9d912048c32..9b69dd637e2 100644
--- a/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl
+++ b/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl
@@ -2,4 +2,3 @@
 
 medical-scanner-verb-enter = Залезть
 medical-scanner-verb-noun-occupant = пациента
-health-analyzer-window-return-button-text = < НАЗАД
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/body/organs/resomi_organs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/body/organs/resomi_organs.ftl
deleted file mode 100644
index c283341f51e..00000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/body/organs/resomi_organs.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-OrganResomiLungs = { ent-OrganHumanLungs }
-    .desc = Продвинутая пара лёгких Резоми. Фильтрует кислород, постоянно перемещая воздух через воздушные мешки.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/belt/belts.ftl
index 110d5113ee9..24b376747ac 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/belt/belts.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/belt/belts.ftl
@@ -2,8 +2,3 @@ ent-ClothingBeltWhiteSheath = белые сабельные ножны
    .desc = Стиль, блеск, всё для лучших сабель во вселенной.
 ent-ClothingBeltSheriffSheath = сабельные ножны шерифа
    .desc = Практичность, прочность, сабля точно не окажется в вашей ноге.
-ent-ClothingBeltSurgicalBoard = магнитная доска хирурга
-   .desc = Может магнитить хирургические инструменты, изготовленные на Медицинском ТехФабе. Помощник хирурга? У меня есть свой дружок!
-ent-ClothingBeltSurgicalBoardFilled = { ent-ClothingBeltSurgicalBoard }
-   .desc = { ent-ClothingBeltSurgicalBoard.desc }
-   .suffix = Заполненный
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
index 67a91f0ac9f..1fe4b2d1fa4 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
@@ -1,4 +1,2 @@
 ent-SpawnPointPilot = пилот
     .desc = { ent-SpawnPointJobBase.desc }
-ent-SpawnPointSurgeon = хирург
-    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/operating_table.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/operating_table.ftl
index c6b9ca05fd1..bc4fad5d91c 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/operating_table.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/operating_table.ftl
@@ -1,2 +1,2 @@
 ent-OperatingTable = операционный стол
-    .desc = Специальный медицинский стол для проведения операций. Смотря на него у вас неожиданно возникает ощущение быстрого течения времени...
+    .desc = Специальный медицинский стол для проведения операций. Впрочем, сейчас это просто бесполезный реквизит.
diff --git a/Resources/Maps/Corvax/corvax_astra.yml b/Resources/Maps/Corvax/corvax_astra.yml
index c0b049766a6..56369769819 100644
--- a/Resources/Maps/Corvax/corvax_astra.yml
+++ b/Resources/Maps/Corvax/corvax_astra.yml
@@ -240109,13 +240109,6 @@ entities:
     - type: Transform
       pos: 48.5,-82.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 44144
-    components:
-    - type: Transform
-      pos: -52.5,-18.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 31865
diff --git a/Resources/Maps/Corvax/corvax_avrite.yml b/Resources/Maps/Corvax/corvax_avrite.yml
index 59124e10692..a93eadb08a7 100644
--- a/Resources/Maps/Corvax/corvax_avrite.yml
+++ b/Resources/Maps/Corvax/corvax_avrite.yml
@@ -357406,18 +357406,6 @@ entities:
     - type: Transform
       pos: 33.5,23.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 6331
-    components:
-    - type: Transform
-      pos: 1.5,-60.5
-      parent: 2
-  - uid: 7207
-    components:
-    - type: Transform
-      pos: 16.5,-57.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 23806
diff --git a/Resources/Maps/Corvax/corvax_awesome.yml b/Resources/Maps/Corvax/corvax_awesome.yml
index bcb5ac2e869..afb6c7b6efa 100644
--- a/Resources/Maps/Corvax/corvax_awesome.yml
+++ b/Resources/Maps/Corvax/corvax_awesome.yml
@@ -104513,18 +104513,6 @@ entities:
     - type: Transform
       pos: -25.5,-37.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 13471
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 2
-  - uid: 13472
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 13473
diff --git a/Resources/Maps/Corvax/corvax_delta.yml b/Resources/Maps/Corvax/corvax_delta.yml
index 063c486977a..59656bee504 100644
--- a/Resources/Maps/Corvax/corvax_delta.yml
+++ b/Resources/Maps/Corvax/corvax_delta.yml
@@ -230299,18 +230299,6 @@ entities:
     - type: Transform
       pos: -78.5,-0.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 14756
-    components:
-    - type: Transform
-      pos: 33.5,-50.5
-      parent: 2
-  - uid: 14757
-    components:
-    - type: Transform
-      pos: 33.5,-48.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 30046
diff --git a/Resources/Maps/Corvax/corvax_glacier.yml b/Resources/Maps/Corvax/corvax_glacier.yml
index 630e170a181..089d20a01f2 100644
--- a/Resources/Maps/Corvax/corvax_glacier.yml
+++ b/Resources/Maps/Corvax/corvax_glacier.yml
@@ -242978,28 +242978,6 @@ entities:
     - type: Transform
       pos: 2.5,-41.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 27254
-    components:
-    - type: Transform
-      pos: -21.5,44.5
-      parent: 2
-  - uid: 27255
-    components:
-    - type: Transform
-      pos: -25.5,45.5
-      parent: 2
-  - uid: 27256
-    components:
-    - type: Transform
-      pos: -15.5,47.5
-      parent: 2
-  - uid: 27257
-    components:
-    - type: Transform
-      pos: -16.5,43.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 27258
diff --git a/Resources/Maps/Corvax/corvax_maus.yml b/Resources/Maps/Corvax/corvax_maus.yml
index 1035e0e3b09..b43cae6ca22 100644
--- a/Resources/Maps/Corvax/corvax_maus.yml
+++ b/Resources/Maps/Corvax/corvax_maus.yml
@@ -113454,13 +113454,6 @@ entities:
     - type: Transform
       pos: -68.5,-16.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19727
-    components:
-    - type: Transform
-      pos: -64.5,-38.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 17300
diff --git a/Resources/Maps/Corvax/corvax_outpost.yml b/Resources/Maps/Corvax/corvax_outpost.yml
index 93a25228eec..f4d04f651b4 100644
--- a/Resources/Maps/Corvax/corvax_outpost.yml
+++ b/Resources/Maps/Corvax/corvax_outpost.yml
@@ -104959,18 +104959,7 @@ entities:
     - type: Transform
       pos: -23.5,20.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19716
-    components:
-    - type: Transform
-      pos: 21.5,-43.5
-      parent: 2
-  - uid: 19717
-    components:
-    - type: Transform
-      pos: -0.5,-37.5
-      parent: 2
+
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 13775
diff --git a/Resources/Maps/Corvax/corvax_paper.yml b/Resources/Maps/Corvax/corvax_paper.yml
index 658cc5c2137..9e3a0dbe623 100644
--- a/Resources/Maps/Corvax/corvax_paper.yml
+++ b/Resources/Maps/Corvax/corvax_paper.yml
@@ -102764,13 +102764,6 @@ entities:
     - type: Transform
       pos: 43.5,60.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 14989
-    components:
-    - type: Transform
-      pos: 48.5,-10.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 14990
diff --git a/Resources/Maps/Corvax/corvax_pearl.yml b/Resources/Maps/Corvax/corvax_pearl.yml
index 103573aae3e..4160afb5b43 100644
--- a/Resources/Maps/Corvax/corvax_pearl.yml
+++ b/Resources/Maps/Corvax/corvax_pearl.yml
@@ -135627,13 +135627,6 @@ entities:
     - type: Transform
       pos: 49.5,110.5
       parent: 1
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19326
-    components:
-    - type: Transform
-      pos: 118.5,40.5
-      parent: 1
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 19347
diff --git a/Resources/Maps/Corvax/corvax_pilgrim.yml b/Resources/Maps/Corvax/corvax_pilgrim.yml
index 5944fd86adb..af6f34d90d4 100644
--- a/Resources/Maps/Corvax/corvax_pilgrim.yml
+++ b/Resources/Maps/Corvax/corvax_pilgrim.yml
@@ -205678,13 +205678,6 @@ entities:
     - type: Transform
       pos: -8.5,32.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 42900
-    components:
-    - type: Transform
-      pos: -57.5,-30.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 19112
diff --git a/Resources/Maps/Corvax/corvax_tushkan.yml b/Resources/Maps/Corvax/corvax_tushkan.yml
index 4be84420cfa..c7b964237c1 100644
--- a/Resources/Maps/Corvax/corvax_tushkan.yml
+++ b/Resources/Maps/Corvax/corvax_tushkan.yml
@@ -70358,13 +70358,6 @@ entities:
     - type: Transform
       pos: -10.5,-18.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 11099
-    components:
-    - type: Transform
-      pos: -19.5,-3.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 7117
diff --git a/Resources/Maps/Next/next_astra.yml b/Resources/Maps/Next/next_astra.yml
index 5f0d852dd60..029bf303f2c 100644
--- a/Resources/Maps/Next/next_astra.yml
+++ b/Resources/Maps/Next/next_astra.yml
@@ -240109,13 +240109,6 @@ entities:
     - type: Transform
       pos: 48.5,-82.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 44144
-    components:
-    - type: Transform
-      pos: -52.5,-18.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 31865
diff --git a/Resources/Maps/Next/next_avrite.yml b/Resources/Maps/Next/next_avrite.yml
index e7ed1151ae5..15382b98ca3 100644
--- a/Resources/Maps/Next/next_avrite.yml
+++ b/Resources/Maps/Next/next_avrite.yml
@@ -357178,18 +357178,6 @@ entities:
     - type: Transform
       pos: 33.5,23.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 6331
-    components:
-    - type: Transform
-      pos: 1.5,-60.5
-      parent: 2
-  - uid: 7207
-    components:
-    - type: Transform
-      pos: 16.5,-57.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 23806
diff --git a/Resources/Maps/Next/next_awesome.yml b/Resources/Maps/Next/next_awesome.yml
index fdb4d557e8e..86a6f154340 100644
--- a/Resources/Maps/Next/next_awesome.yml
+++ b/Resources/Maps/Next/next_awesome.yml
@@ -104480,18 +104480,6 @@ entities:
     - type: Transform
       pos: -25.5,-37.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 13471
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 2
-  - uid: 13472
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 13473
diff --git a/Resources/Maps/Next/next_bagel.yml b/Resources/Maps/Next/next_bagel.yml
index df1e17673a5..30ae2290d37 100644
--- a/Resources/Maps/Next/next_bagel.yml
+++ b/Resources/Maps/Next/next_bagel.yml
@@ -131817,13 +131817,6 @@ entities:
     - type: Transform
       pos: -3.5,16.5
       parent: 60
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 10719
-    components:
-    - type: Transform
-      pos: 39.5,-13.5
-      parent: 60
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 4547
diff --git a/Resources/Maps/Next/next_delta.yml b/Resources/Maps/Next/next_delta.yml
index 972ea0b17c7..0581ebfb50e 100644
--- a/Resources/Maps/Next/next_delta.yml
+++ b/Resources/Maps/Next/next_delta.yml
@@ -230299,18 +230299,6 @@ entities:
     - type: Transform
       pos: -78.5,-0.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 14756
-    components:
-    - type: Transform
-      pos: 33.5,-50.5
-      parent: 2
-  - uid: 14757
-    components:
-    - type: Transform
-      pos: 33.5,-48.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 30046
diff --git a/Resources/Maps/Next/next_glacier.yml b/Resources/Maps/Next/next_glacier.yml
index ede4c5ea13a..bd173b6fda7 100644
--- a/Resources/Maps/Next/next_glacier.yml
+++ b/Resources/Maps/Next/next_glacier.yml
@@ -246609,28 +246609,6 @@ entities:
     - type: Transform
       pos: 2.5,-41.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 27884
-    components:
-    - type: Transform
-      pos: -21.5,44.5
-      parent: 2
-  - uid: 27885
-    components:
-    - type: Transform
-      pos: -25.5,45.5
-      parent: 2
-  - uid: 27886
-    components:
-    - type: Transform
-      pos: -15.5,47.5
-      parent: 2
-  - uid: 27887
-    components:
-    - type: Transform
-      pos: -16.5,43.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 27888
diff --git a/Resources/Maps/Next/next_maus.yml b/Resources/Maps/Next/next_maus.yml
index 8d739f4384d..a0f127753e6 100644
--- a/Resources/Maps/Next/next_maus.yml
+++ b/Resources/Maps/Next/next_maus.yml
@@ -113430,25 +113430,6 @@ entities:
     - type: Transform
       pos: -68.5,-16.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19727
-    components:
-    - type: Transform
-      pos: -64.5,-38.5
-      parent: 2
-- proto: SpawnPointTechnicalAssistant
-  entities:
-  - uid: 17300
-    components:
-    - type: Transform
-      pos: -68.5,-19.5
-      parent: 2
-  - uid: 17301
-    components:
-    - type: Transform
-      pos: -68.5,-17.5
-      parent: 2
 - proto: SpawnPointWarden
   entities:
   - uid: 5997
diff --git a/Resources/Maps/Next/next_outpost.yml b/Resources/Maps/Next/next_outpost.yml
index 31b11685ebc..e5a45dfc782 100644
--- a/Resources/Maps/Next/next_outpost.yml
+++ b/Resources/Maps/Next/next_outpost.yml
@@ -95061,18 +95061,6 @@ entities:
     - type: Transform
       pos: -23.5,20.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19716
-    components:
-    - type: Transform
-      pos: 21.5,-43.5
-      parent: 2
-  - uid: 19717
-    components:
-    - type: Transform
-      pos: -0.5,-37.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 13775
diff --git a/Resources/Maps/Next/next_paper.yml b/Resources/Maps/Next/next_paper.yml
index a2424433270..29189bc455d 100644
--- a/Resources/Maps/Next/next_paper.yml
+++ b/Resources/Maps/Next/next_paper.yml
@@ -102764,13 +102764,6 @@ entities:
     - type: Transform
       pos: 43.5,60.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 14989
-    components:
-    - type: Transform
-      pos: 48.5,-10.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 14990
diff --git a/Resources/Maps/Next/next_pearl.yml b/Resources/Maps/Next/next_pearl.yml
index 640bbbd0fe9..40aea253093 100644
--- a/Resources/Maps/Next/next_pearl.yml
+++ b/Resources/Maps/Next/next_pearl.yml
@@ -134999,13 +134999,6 @@ entities:
     - type: Transform
       pos: 49.5,110.5
       parent: 1
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19326
-    components:
-    - type: Transform
-      pos: 118.5,40.5
-      parent: 1
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 19347
diff --git a/Resources/Maps/Next/next_pilgrim.yml b/Resources/Maps/Next/next_pilgrim.yml
index b934649646d..43ec383e06e 100644
--- a/Resources/Maps/Next/next_pilgrim.yml
+++ b/Resources/Maps/Next/next_pilgrim.yml
@@ -205674,13 +205674,6 @@ entities:
     - type: Transform
       pos: -8.5,32.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 42900
-    components:
-    - type: Transform
-      pos: -57.5,-30.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 19112
diff --git a/Resources/Maps/Next/next_tushkan.yml b/Resources/Maps/Next/next_tushkan.yml
index ef38bfd702f..a8d374d35ff 100644
--- a/Resources/Maps/Next/next_tushkan.yml
+++ b/Resources/Maps/Next/next_tushkan.yml
@@ -70358,13 +70358,6 @@ entities:
     - type: Transform
       pos: -10.5,-18.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 11099
-    components:
-    - type: Transform
-      pos: -19.5,-3.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 7117
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 59119026047..390bec95b68 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -5,7 +5,6 @@
   id: BaseAlertOrder
   order:
     - category: Health
-    - category: Mood
     - category: Stamina
     - alertType: SuitPower
     - category: Internals
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index 37dfaa72a92..e59aad9da3f 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -41,7 +41,6 @@
     - state: lung-l
     - state: lung-r
   - type: Organ
-    slotId: lungs
   - type: Lung
   - type: Metabolizer
     removeEmpty: true
@@ -74,7 +73,6 @@
   - type: Sprite
     state: stomach
   - type: Organ
-    slotId: stomach
   - type: SolutionContainerManager
     solutions:
       stomach:
@@ -118,19 +116,12 @@
   - type: Sprite
     state: liver
   - type: Organ
-    slotId: liver
-  - type: Liver
   - type: Metabolizer
     maxReagents: 1
     metabolizerTypes: [ Animal ]
     groups:
     - id: Alcohol
       rateModifier: 0.1
-  - type: Tag # goob edit
-    tags:
-    - Meat
-    - Organ
-    - Liver
   - type: Item
     size: Small
     heldPrefix: liver
@@ -144,7 +135,6 @@
   - type: Sprite
     state: heart-on
   - type: Organ
-    slotId: heart # _CorvaxNext
   - type: Metabolizer
     maxReagents: 2
     metabolizerTypes: [ Animal ]
@@ -152,12 +142,6 @@
     - id: Medicine
     - id: Poison
     - id: Narcotic
-  - type: Heart # _CorvaxNext
-  - type: Tag # goob edit
-    tags:
-    - Meat
-    - Organ
-    - Heart
   - type: Item
     size: Small
     heldPrefix: heart
@@ -173,7 +157,6 @@
     - state: kidney-l
     - state: kidney-r
   - type: Organ
-    slotId: kidneys # _CorvaxNext
   - type: Metabolizer
     maxReagents: 5
     metabolizerTypes: [ Animal ]
@@ -181,64 +164,3 @@
   - type: Item
     size: Small
     heldPrefix: kidneys
-
-- type: entity
-  id: OrganAnimalBrain
-  parent: BaseAnimalOrganUnGibbable
-  name: animal brain
-  description: "Not so intelligence, not so honk."
-  components:
-  - type: Sprite
-    state: brain
-  - type: Organ
-    slotId: brain # backmen: surgery
-  - type: Input
-    context: "ghost"
-  - type: Brain
-  - type: InputMover
-  - type: Examiner
-  - type: BlockMovement
-  - type: BadFood
-  - type: Tag
-    tags:
-      - Meat
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: GreyMatter
-          Quantity: 5
-  - type: FlavorProfile
-    flavors:
-      - people
-  - type: FoodSequenceElement
-    entries:
-      Burger: Brain
-      Taco: Brain
-  - type: Item
-    size: Small
-    heldPrefix: brain
-
-- type: entity
-  id: OrganAnimalEyes
-  parent: BaseAnimalOrgan
-  name: animal eyes
-  description: "I see you!"
-  components:
-  # start-backmen: surgery
-  - type: Organ
-    slotId: eyes
-  - type: Eyes
-  # end-backmen: surgery
-  - type: Sprite
-    layers:
-      - state: eyeball-l
-      - state: eyeball-r
-  - type: Item
-    size: Small
-    heldPrefix: eyeballs
diff --git a/Resources/Prototypes/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
index baa6674a471..f1a3d47e667 100644
--- a/Resources/Prototypes/Body/Organs/Animal/slimes.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
@@ -8,8 +8,6 @@
       sprite: Mobs/Species/Slime/organs.rsi
       state: brain-slime
     - type: Stomach
-    - type: Organ
-      slotId: core
     - type: Metabolizer
       maxReagents: 3
       metabolizerTypes: [ Slime ]
@@ -40,8 +38,6 @@
         - state: lung-r-slime
     - type: Lung
       alert: LowNitrogen
-    - type: Organ
-      slotId: lungs
     - type: Metabolizer
       removeEmpty: true
       solutionOnBody: false
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index 1cd8e52838d..5b9c46487f9 100644
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -40,8 +40,6 @@
   - type: Stomach
     digestionDelay: 30
     updateInterval: 1.5
-  - type: Organ
-    slotId: stomach
   - type: SolutionContainerManager
     solutions:
       stomach:
@@ -65,8 +63,6 @@
       - state: lung-l
       - state: lung-r
   - type: Lung
-  - type: Organ
-    slotId: lungs
   - type: Metabolizer
     updateInterval: 1.5
     removeEmpty: true
@@ -99,9 +95,9 @@
   components:
   - type: Sprite
     state: heart-on
-  - type: Heart
-  - type: Organ
-    slotId: heart
+  - type: Item
+    size: Small
+    heldPrefix: heart
   - type: Metabolizer
     updateInterval: 1.5
     maxReagents: 2
@@ -110,11 +106,6 @@
     - id: Medicine
     - id: Poison
     - id: Narcotic
-  - type: Tag # goob edit
-    tags:
-    - Meat
-    - Organ
-    - Heart
 
 - type: entity
   id: OrganArachnidLiver
@@ -128,9 +119,6 @@
     heldPrefix: liver
   - type: Sprite
     state: liver
-  - type: Liver
-  - type: Organ
-    slotId: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
     updateInterval: 1.5
     maxReagents: 1
@@ -138,11 +126,6 @@
     groups:
     - id: Alcohol
       rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
-  - type: Tag # goob edit
-    tags:
-    - Meat
-    - Organ
-    - Liver
 
 - type: entity
   id: OrganArachnidKidneys
@@ -151,8 +134,6 @@
   description: "Filters toxins from the bloodstream."
   categories: [ HideSpawnMenu ]
   components:
-  - type: Organ # Shitmed
-    slotId: kidneys
   - type: Sprite
     layers:
       - state: kidney-l
@@ -177,14 +158,6 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
-  - type: Organ # _CorvaxNext
-    slotId: eyes
-  - type: Eyes # _CorvaxNext
-  - type: Tag # goob edit
-    tags:
-    - Meat
-    - Organ
-    - Eyes
   - type: Item
     size: Small
     heldPrefix: eyeballs
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index d779dc64113..bf865a07fd9 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -36,9 +36,6 @@
     heldPrefix: brain
   - type: Sprite
     state: brain
-  - type: Organ # _CorvaxNext
-    slotId: Brain
-  - type: Brain # _CorvaxNext
   - type: SolutionContainerManager
     solutions:
       organ:
@@ -65,13 +62,6 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
-  - type: Organ # _CorvaxNext
-    slotId: eyes
-  - type: Tag # goob edit
-    tags:
-    - Meat
-    - Organ
-    - Eyes
 
 - type: entity
   id: OrganDionaStomach
@@ -81,8 +71,6 @@
   components:
   - type: Sprite
     state: stomach
-  - type: Organ
-    slotId: stomach
   - type: SolutionContainerManager
     solutions:
       stomach:
@@ -120,9 +108,7 @@
   - type: Item
     size: Small
     heldPrefix: lungs
-  - type: Lung
-  - type: Organ
-    slotId: lungs
+  - type: Lung 
   - type: Metabolizer
     removeEmpty: true
     solutionOnBody: false
@@ -151,7 +137,7 @@
   description: "The source of incredible, unending intelligence. Honk."
   components:
   - type: Brain
-  - type: Nymph # This will make the organs turn into a nymph when they're removed.
+  - type: Nymph # This will make the organs turn into a nymph when they're removed. 
     entityPrototype: OrganDionaNymphBrain
     transferMind: true
 
@@ -190,11 +176,11 @@
 
 - type: entity
   id: OrganDionaNymphStomach
-  parent: MobDionaNymphAccent
+  parent: MobDionaNymphAccent 
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Stomach
-  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it.
+  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
   components:
   - type: IsDeadIC
   - type: Body
@@ -206,7 +192,7 @@
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Lungs
-  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking.
+  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
   components:
   - type: IsDeadIC
   - type: Body
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 59a1a9a2f00..cb1492b8a6a 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -3,36 +3,36 @@
   parent: BaseItem
   abstract: true
   components:
-    - type: Sprite
-      sprite: Mobs/Species/Human/organs.rsi
-    - type: Organ
-    - type: Food
-    - type: Extractable
-      grindableSolutionName: organ
-    - type: SolutionContainerManager
-      solutions:
-        organ:
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 10
-        food:
-          maxVol: 5
-          reagents:
-            - ReagentId: UncookedAnimalProteins
-              Quantity: 5
-    - type: FlavorProfile
-      flavors:
-        - people
-    - type: Tag
-      tags:
-        - Meat
+  - type: Sprite
+    sprite: Mobs/Species/Human/organs.rsi
+  - type: Organ
+  - type: Food
+  - type: Extractable
+    grindableSolutionName: organ
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+      - people
+  - type: Tag
+    tags:
+      - Meat
 
 - type: entity
   id: BaseHumanOrgan
   parent: BaseHumanOrganUnGibbable
   abstract: true
   components:
-    - type: Gibbable
+  - type: Gibbable
 
 - type: entity
   id: OrganHumanBrain
@@ -40,60 +40,54 @@
   name: brain
   description: "The source of incredible, unending intelligence. Honk."
   components:
-    - type: Sprite
-      state: brain
-    - type: Organ
-      slotId: brain # _CorvaxNext: surgery
-    - type: Input
-      context: "ghost"
-    - type: Brain
-    - type: InputMover
-    - type: Examiner
-    - type: BlockMovement
-    - type: BadFood
-    - type: Tag
-      tags:
-        - Meat
-    - type: SolutionContainerManager
-      solutions:
-        organ:
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 10
-        food:
-          maxVol: 5
-          reagents:
-            - ReagentId: GreyMatter
-              Quantity: 5
-    - type: FlavorProfile
-      flavors:
-        - people
-    - type: FoodSequenceElement
-      entries:
-        Burger: Brain
-        Taco: Brain
-    - type: Item
-      size: Small
-      heldPrefix: brain
-
+  - type: Sprite
+    state: brain
+  - type: Organ
+  - type: Input
+    context: "ghost"
+  - type: Brain
+  - type: InputMover
+  - type: Examiner
+  - type: BlockMovement
+  - type: BadFood
+  - type: Tag
+    tags:
+      - Meat
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+      - people
+  - type: FoodSequenceElement
+    entries:
+      Burger: Brain
+      Taco: Brain
+  - type: Item
+    size: Small
+    heldPrefix: brain
+  
 - type: entity
   id: OrganHumanEyes
   parent: BaseHumanOrgan
   name: eyes
   description: "I see you!"
   components:
-    # start-_CorvaxNext: surgery
-    - type: Organ
-      slotId: eyes
-    - type: Eyes
-    # end-_CorvaxNext: surgery
-    - type: Sprite
-      layers:
-        - state: eyeball-l
-        - state: eyeball-r
-    - type: Item
-      size: Small
-      heldPrefix: eyeballs
+  - type: Sprite
+    layers:
+      - state: eyeball-l
+      - state: eyeball-r
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
 
 - type: entity
   id: OrganHumanTongue
@@ -101,19 +95,19 @@
   name: tongue
   description: "A fleshy muscle mostly used for lying."
   components:
-    - type: Sprite
-      state: tongue
+  - type: Sprite
+    state: tongue
 
 - type: entity
   id: OrganHumanAppendix
   parent: BaseHumanOrgan
   name: appendix
   components:
-    - type: Sprite
-      layers:
-        - state: appendix
-        - state: appendix-inflamed
-          visible: false
+  - type: Sprite
+    layers:
+    - state: appendix
+    - state: appendix-inflamed
+      visible: false
 
 - type: entity
   id: OrganHumanEars
@@ -123,7 +117,6 @@
   components:
   - type: Sprite
     state: ears
-  - type: Ears # _CorvaxNext: surgery
 
 - type: entity
   id: OrganHumanLungs
@@ -131,38 +124,36 @@
   name: lungs
   description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
   components:
-    - type: Sprite
-      layers:
-        - state: lung-l
-        - state: lung-r
-    - type: Item
-      size: Small
-      heldPrefix: lungs
-    - type: Lung
-    - type: Organ # _CorvaxNext: surgery
-      slotId: lungs
-    - type: Metabolizer
-      removeEmpty: true
-      solutionOnBody: false
-      solution: "Lung"
-      metabolizerTypes: [Human]
-      groups:
-        - id: Gas
-          rateModifier: 100.0
-    - type: SolutionContainerManager
-      solutions:
-        organ:
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 10
-        Lung:
-          maxVol: 100.0
-          canReact: false
-        food:
-          maxVol: 5
-          reagents:
-            - ReagentId: UncookedAnimalProteins
-              Quantity: 5
+  - type: Sprite
+    layers:
+      - state: lung-l
+      - state: lung-r
+  - type: Item
+    size: Small
+    heldPrefix: lungs
+  - type: Lung
+  - type: Metabolizer
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Human ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100.0
+        canReact: false
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
 
 - type: entity
   id: OrganHumanHeart
@@ -170,26 +161,21 @@
   name: heart
   description: "I feel bad for the heartless bastard who lost this."
   components:
-    # start-_CorvaxNext: surgery
-    - type: Heart
-    - type: Organ
-      slotId: heart
-    # end-_CorvaxNext: surgery
-    - type: Sprite
-      state: heart-on
-    # The heart 'metabolizes' medicines and poisons that aren't filtered out by other organs.
-    # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body.
-    # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
-    - type: Metabolizer
-      maxReagents: 2
-      metabolizerTypes: [Human]
-      groups:
-        - id: Medicine
-        - id: Poison
-        - id: Narcotic
-    - type: Item
-      size: Small
-      heldPrefix: heart
+  - type: Sprite
+    state: heart-on
+  # The heart 'metabolizes' medicines and poisons that aren't filtered out by other organs.
+  # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body.
+  # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
+  - type: Metabolizer
+    maxReagents: 2
+    metabolizerTypes: [Human]
+    groups:
+    - id: Medicine
+    - id: Poison
+    - id: Narcotic
+  - type: Item
+    size: Small
+    heldPrefix: heart
 
 - type: entity
   id: OrganHumanStomach
@@ -197,33 +183,31 @@
   name: stomach
   description: "Gross. This is hard to stomach."
   components:
-    - type: Sprite
-      state: stomach
-    - type: Item
-      size: Small
-      heldPrefix: stomach
-    - type: SolutionContainerManager
-      solutions:
-        stomach:
-          maxVol: 50
-        food:
-          maxVol: 5
-          reagents:
-            - ReagentId: UncookedAnimalProteins
-              Quantity: 5
-    - type: Stomach
-    - type: Organ # _CorvaxNext: surgery
-      slotId: stomach
-    # The stomach metabolizes stuff like foods and drinks.
-    # TODO: Have it work off of the ent's solution container, and move this
-    # to intestines instead.
-    - type: Metabolizer
-      # mm yummy
-      maxReagents: 3
-      metabolizerTypes: [Human]
-      groups:
-        - id: Food
-        - id: Drink
+  - type: Sprite
+    state: stomach
+  - type: Item
+    size: Small
+    heldPrefix: stomach
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Stomach
+  # The stomach metabolizes stuff like foods and drinks.
+  # TODO: Have it work off of the ent's solution container, and move this
+  # to intestines instead.
+  - type: Metabolizer
+    # mm yummy
+    maxReagents: 3
+    metabolizerTypes: [Human]
+    groups:
+    - id: Food
+    - id: Drink
 
 - type: entity
   id: OrganHumanLiver
@@ -231,22 +215,17 @@
   name: liver
   description: "Pairing suggestion: chianti and fava beans."
   components:
-    # start-_CorvaxNext: surgery
-    - type: Liver
-    - type: Organ
-      slotId: liver
-    # end-_CorvaxNext: surgery
-    - type: Sprite
-      state: liver
-    - type: Item
-      size: Small
-      heldPrefix: liver
-    - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
-      maxReagents: 1
-      metabolizerTypes: [Human]
-      groups:
-        - id: Alcohol
-          rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
+  - type: Sprite
+    state: liver
+  - type: Item
+    size: Small
+    heldPrefix: liver
+  - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
+    maxReagents: 1
+    metabolizerTypes: [Human]
+    groups:
+    - id: Alcohol
+      rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
 
 - type: entity
   id: OrganHumanKidneys
@@ -254,8 +233,6 @@
   name: kidneys
   description: "Filters toxins from the bloodstream."
   components:
-  - type: Organ # Shitmed
-    slotId: kidneys
   - type: Sprite
     layers:
       - state: kidney-l
diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml
index 2316a65eb35..535c25c9d3f 100644
--- a/Resources/Prototypes/Body/Organs/moth.yml
+++ b/Resources/Prototypes/Body/Organs/moth.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: OrganMothStomach
-  name: moth stomach
   parent: [OrganAnimalStomach, OrganHumanStomach]
   categories: [ HideSpawnMenu ]
   components:
diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml
index 5b3a5d66f27..ca22d25423c 100644
--- a/Resources/Prototypes/Body/Organs/slime.yml
+++ b/Resources/Prototypes/Body/Organs/slime.yml
@@ -8,8 +8,6 @@
       sprite: Mobs/Species/Slime/organs.rsi
       state: brain-slime
     - type: Stomach
-    - type: Organ
-      slotId: core
     - type: Metabolizer
       maxReagents: 6
       metabolizerTypes: [ Slime ]
@@ -39,7 +37,7 @@
       size: Small
       heldPrefix: brain
 
-
+      
 - type: entity
   id: OrganSlimeLungs
   parent: BaseHumanOrgan
@@ -51,8 +49,6 @@
     layers:
       - state: lung-l-slime
       - state: lung-r-slime
-  - type: Organ
-    slotId: lungs
   - type: Lung
     alert: LowNitrogen
   - type: Metabolizer
diff --git a/Resources/Prototypes/Body/Organs/vox.yml b/Resources/Prototypes/Body/Organs/vox.yml
index 0e071571e10..70e07832712 100644
--- a/Resources/Prototypes/Body/Organs/vox.yml
+++ b/Resources/Prototypes/Body/Organs/vox.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: OrganVoxLungs
-  name: vox lungs
   parent: OrganHumanLungs
   description: "The blue, anaerobic lungs of a vox, they intake nitrogen to breathe. Any form of gaseous oxygen is lethally toxic if breathed in."
   suffix: "vox"
diff --git a/Resources/Prototypes/Body/Parts/Animal/kobold.yml b/Resources/Prototypes/Body/Parts/Animal/kobold.yml
deleted file mode 100644
index 2ca5bd7ea78..00000000000
--- a/Resources/Prototypes/Body/Parts/Animal/kobold.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# TODO: Add descriptions (many)
-
-- type: entity
-  id: PartKobold
-  parent: [BaseItem, BasePart]
-  name: "Kobold body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoKobold
-  name: "Kobold torso"
-  parent: [PartKobold, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-- type: entity
-  id: HeadKobold
-  name: "Kobold head"
-  parent: [PartKobold, BaseHead]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmKobold
-  name: "left Kobold arm"
-  parent: [PartKobold, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmKobold
-  name: "right Kobold arm"
-  parent: [PartKobold, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandKobold
-  name: "left Kobold hand"
-  parent: [PartKobold, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandKobold
-  name: "right Kobold hand"
-  parent: [PartKobold, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegKobold
-  name: "left Kobold leg"
-  parent: [PartKobold, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegKobold
-  name: "right Kobold leg"
-  parent: [PartKobold, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootKobold
-  name: "left Kobold foot"
-  parent: [PartKobold, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootKobold
-  name: "right Kobold foot"
-  parent: [PartKobold, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/Body/Parts/Animal/monkey.yml b/Resources/Prototypes/Body/Parts/Animal/monkey.yml
deleted file mode 100644
index 01b8aa4de8a..00000000000
--- a/Resources/Prototypes/Body/Parts/Animal/monkey.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# TODO: Add descriptions (many)
-
-- type: entity
-  id: PartMonkey
-  parent: [BaseItem, BasePart]
-  name: "monkey body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoMonkey
-  name: "monkey torso"
-  parent: [PartMonkey, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-- type: entity
-  id: HeadMonkey
-  name: "monkey head"
-  parent: [PartMonkey, BaseHead]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmMonkey
-  name: "left monkey arm"
-  parent: [PartMonkey, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmMonkey
-  name: "right monkey arm"
-  parent: [PartMonkey, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandMonkey
-  name: "left monkey hand"
-  parent: [PartMonkey, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandMonkey
-  name: "right monkey hand"
-  parent: [PartMonkey, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegMonkey
-  name: "left monkey leg"
-  parent: [PartMonkey, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegMonkey
-  name: "right monkey leg"
-  parent: [PartMonkey, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootMonkey
-  name: "left monkey foot"
-  parent: [PartMonkey, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootMonkey
-  name: "right monkey foot"
-  parent: [PartMonkey, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml
index 734e7e24ad0..347b052c8bc 100644
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -12,7 +12,7 @@
   - type: Sprite
     sprite: Mobs/Species/Reptilian/parts.rsi
   - type: Damageable
-    damageContainer: OrganicPart # _CorvaxNext: surgery _CorvaxNext
+    damageContainer: Biological
   - type: BodyPart
   - type: ContainerContainer
     containers:
@@ -45,7 +45,6 @@
   - type: BodyPart
     partType: Hand
     symmetry: Left
-    slotId: hands # Shitmed
 
 - type: entity
   id: LegsAnimal
@@ -59,7 +58,6 @@
     - state: r_leg
   - type: BodyPart
     partType: Leg
-    slotId: legs # Shitmed
   - type: MovementBodyPart
 
 - type: entity
@@ -74,7 +72,6 @@
     - state: l_foot
   - type: BodyPart
     partType: Foot
-    slotId: feet # Shitmed
 
 - type: entity
   id: TorsoAnimal
@@ -97,13 +94,3 @@
       - ReagentId: Blood
         Quantity: 20
 
-# Monkey head for borging/transplanting pun pun
-- type: entity
-  parent: [PartAnimal, BaseHead]
-  id: HeadAnimal
-  name: animal head
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - state: head_m
diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml
index f2b9e5b76be..836d0f140af 100644
--- a/Resources/Prototypes/Body/Parts/base.yml
+++ b/Resources/Prototypes/Body/Parts/base.yml
@@ -1,3 +1,5 @@
+# TODO: Add descriptions (many)
+# TODO BODY: Part damage
 - type: entity
   id: BasePart
   parent: BaseItem
@@ -5,15 +7,9 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: OrganicPart # _CorvaxNext: surgery
+    damageContainer: Biological
   - type: BodyPart
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/Medical/Surgery/organ2.ogg
-  # end-_CorvaxNext: surgery
+  - type: Gibbable
   - type: ContainerContainer
     containers:
       bodypart: !type:Container
@@ -23,38 +19,6 @@
   - type: Tag
     tags:
       - Trash
-  # start-_CorvaxNext: surgery
-  - type: Gibbable # _CorvaxNext: surgery
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 75
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 100
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 200
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  # end-_CorvaxNext: surgery
 
 - type: entity
   id: BaseTorso
@@ -64,13 +28,6 @@
   components:
   - type: BodyPart
     partType: Torso
-  # start-_CorvaxNext: surgery
-    toolName: "a torso"
-    containerName: "torso_slot"
-  - type: ContainerContainer
-    containers:
-      torso_slot: !type:ContainerSlot {}
-  # end-_CorvaxNext: surgery
 
 - type: entity
   id: BaseHead
@@ -80,7 +37,6 @@
   components:
   - type: BodyPart
     partType: Head
-    toolName: "a head" # _CorvaxNext: surgery
     vital: true
   - type: Input
     context: "ghost"
@@ -97,7 +53,6 @@
   - type: BodyPart
     partType: Arm
     symmetry: Left
-    toolName: "a left arm" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseRightArm
@@ -108,7 +63,6 @@
   - type: BodyPart
     partType: Arm
     symmetry: Right
-    toolName: "a right arm" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseLeftHand
@@ -119,7 +73,6 @@
   - type: BodyPart
     partType: Hand
     symmetry: Left
-    toolName: "a left hand" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseRightHand
@@ -130,7 +83,6 @@
   - type: BodyPart
     partType: Hand
     symmetry: Right
-    toolName: "a right hand" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseLeftLeg
@@ -141,7 +93,6 @@
   - type: BodyPart
     partType: Leg
     symmetry: Left
-    toolName: "a left leg" # _CorvaxNext: surgery
   - type: MovementBodyPart
 
 - type: entity
@@ -153,7 +104,6 @@
   - type: BodyPart
     partType: Leg
     symmetry: Right
-    toolName: "a right leg" # _CorvaxNext: surgery
   - type: MovementBodyPart
 
 - type: entity
@@ -165,7 +115,6 @@
   - type: BodyPart
     partType: Foot
     symmetry: Left
-    toolName: "a left foot" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseRightFoot
@@ -176,4 +125,3 @@
   - type: BodyPart
     partType: Foot
     symmetry: Right
-    toolName: "a right foot" # _CorvaxNext: surgery
diff --git a/Resources/Prototypes/Body/Parts/Animal/rat.yml b/Resources/Prototypes/Body/Parts/rat.yml
similarity index 100%
rename from Resources/Prototypes/Body/Parts/Animal/rat.yml
rename to Resources/Prototypes/Body/Parts/rat.yml
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
index b8b0ffd3405..113c7189bb2 100644
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -25,11 +25,6 @@
   - type: GuideHelp
     guides:
     - Cyborgs
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/Medical/Surgery/organ2.ogg
   - type: Gibbable
 
 - type: entity
@@ -38,7 +33,6 @@
   name: cyborg left arm
   components:
   - type: BodyPart
-    partType: Arm
     symmetry: Left
   - type: Sprite
     state: borg_l_arm
@@ -56,7 +50,6 @@
   name: cyborg right arm
   components:
   - type: BodyPart
-    partType: Arm
     symmetry: Right
   - type: Sprite
     state: borg_r_arm
@@ -74,13 +67,7 @@
   name: cyborg left leg
   components:
   - type: BodyPart
-    partType: Leg
     symmetry: Left
-    toolName: "a left leg" # Shitmed Change
-    children: # Shitmed Change
-      left foot:
-        id: "left foot"
-        type: Foot
   - type: Sprite
     state: borg_l_leg
   - type: Icon
@@ -97,13 +84,7 @@
   name: cyborg right leg
   components:
   - type: BodyPart
-    partType: Leg
     symmetry: Right
-    toolName: "a right leg" # Shitmed Change
-    children: # Shitmed Change
-      right foot:
-        id: "right foot"
-        type: Foot
   - type: Sprite
     state: borg_r_leg
   - type: Icon
@@ -144,4 +125,4 @@
   - type: Tag
     tags:
     - Trash
-    - BorgTorso
+    - BorgTorso
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Parts/skeleton.yml b/Resources/Prototypes/Body/Parts/skeleton.yml
index 4ffd35c3107..1b378c62332 100644
--- a/Resources/Prototypes/Body/Parts/skeleton.yml
+++ b/Resources/Prototypes/Body/Parts/skeleton.yml
@@ -1,3 +1,4 @@
+# TODO BODY: Part damage
 - type: entity
   id: PartSkeleton
   parent: BaseItem
@@ -5,7 +6,7 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: OrganicPart # _CorvaxNext: surgery
+    damageContainer: Biological
   - type: BodyPart
   - type: ContainerContainer
     containers:
@@ -13,41 +14,10 @@
         ents: []
   - type: StaticPrice
     price: 20
+  - type: Gibbable
   - type: Tag
     tags:
       - Trash
-  # start-_CorvaxNext: surgery
-  - type: Gibbable
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 75
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 100
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 200
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  # end-_CorvaxNext: surgery
 
 - type: entity
   id: TorsoSkeleton
diff --git a/Resources/Prototypes/Body/Parts/vox.yml b/Resources/Prototypes/Body/Parts/vox.yml
index 37481a87e27..9f89a0c583d 100644
--- a/Resources/Prototypes/Body/Parts/vox.yml
+++ b/Resources/Prototypes/Body/Parts/vox.yml
@@ -7,7 +7,7 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: OrganicPart # _CorvaxNext: surgery Shitmed
+    damageContainer: Biological
   - type: BodyPart
   - type: ContainerContainer
     containers:
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/mothroach.yml b/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml
similarity index 100%
rename from Resources/Prototypes/Body/Prototypes/Animal/mothroach.yml
rename to Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml
diff --git a/Resources/Prototypes/Body/Prototypes/a_ghost.yml b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
index a2eaef3dd58..7d358a57622 100644
--- a/Resources/Prototypes/Body/Prototypes/a_ghost.yml
+++ b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
@@ -6,17 +6,17 @@
     torso:
       part: TorsoHuman
       connections:
-      - right arm
-      - left arm
-    right arm:
+      - right_arm
+      - left_arm
+    right_arm:
       part: RightArmHuman
       connections:
-      - right hand
-    left arm:
+      - right_hand
+    left_arm:
       part: LeftArmHuman
       connections:
-      - left hand
-    right hand:
+      - left_hand
+    right_hand:
       part: RightHandHuman
-    left hand:
+    left_hand:
       part: LeftHandHuman
diff --git a/Resources/Prototypes/Body/Prototypes/arachnid.yml b/Resources/Prototypes/Body/Prototypes/arachnid.yml
index c2175076b14..a3caa42a6eb 100644
--- a/Resources/Prototypes/Body/Prototypes/arachnid.yml
+++ b/Resources/Prototypes/Body/Prototypes/arachnid.yml
@@ -23,7 +23,6 @@
       - left arm
       - right leg
       - left leg
-      - head
     right arm:
       part: RightArmArachnid
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/diona.yml b/Resources/Prototypes/Body/Prototypes/diona.yml
index 33a65bdc5c3..12ca203988c 100644
--- a/Resources/Prototypes/Body/Prototypes/diona.yml
+++ b/Resources/Prototypes/Body/Prototypes/diona.yml
@@ -16,7 +16,6 @@
       - left arm
       - right leg
       - left leg
-      - head
       organs:
         stomach: OrganDionaStomachNymph
         lungs: OrganDionaLungsNymph
diff --git a/Resources/Prototypes/Body/Prototypes/dwarf.yml b/Resources/Prototypes/Body/Prototypes/dwarf.yml
index fb5a1753ae4..592492688b7 100644
--- a/Resources/Prototypes/Body/Prototypes/dwarf.yml
+++ b/Resources/Prototypes/Body/Prototypes/dwarf.yml
@@ -17,7 +17,6 @@
       - left arm
       - right leg
       - left leg
-      - head
       organs:
         heart: OrganDwarfHeart
         lungs: OrganHumanLungs
diff --git a/Resources/Prototypes/Body/Prototypes/gingerbread.yml b/Resources/Prototypes/Body/Prototypes/gingerbread.yml
index d7a5d7bc1c4..d5355be6412 100644
--- a/Resources/Prototypes/Body/Prototypes/gingerbread.yml
+++ b/Resources/Prototypes/Body/Prototypes/gingerbread.yml
@@ -17,7 +17,6 @@
       - left arm
       - right leg
       - left leg
-      - head
       organs:
         heart: OrganHumanHeart
         lungs: OrganHumanLungs
diff --git a/Resources/Prototypes/Body/Prototypes/human.yml b/Resources/Prototypes/Body/Prototypes/human.yml
index b46e5049bbd..94c77a27d73 100644
--- a/Resources/Prototypes/Body/Prototypes/human.yml
+++ b/Resources/Prototypes/Body/Prototypes/human.yml
@@ -13,38 +13,37 @@
     torso:
       part: TorsoHuman
       connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
+      - right_arm
+      - left_arm
+      - right_leg
+      - left_leg
       organs:
         heart: OrganHumanHeart
         lungs: OrganHumanLungs
         stomach: OrganHumanStomach
         liver: OrganHumanLiver
         kidneys: OrganHumanKidneys
-    right arm:
+    right_arm:
       part: RightArmHuman
       connections:
-      - right hand
-    left arm:
+      - right_hand
+    left_arm:
       part: LeftArmHuman
       connections:
-      - left hand
-    right hand:
+      - left_hand
+    right_hand:
       part: RightHandHuman
-    left hand:
+    left_hand:
       part: LeftHandHuman
-    right leg:
+    right_leg:
       part: RightLegHuman
       connections:
-      - right foot
-    left leg:
+      - right_foot
+    left_leg:
       part: LeftLegHuman
       connections:
-      - left foot
-    right foot:
+      - left_foot
+    right_foot:
       part: RightFootHuman
-    left foot:
+    left_foot:
       part: LeftFootHuman
diff --git a/Resources/Prototypes/Body/Prototypes/kobold.yml b/Resources/Prototypes/Body/Prototypes/kobold.yml
deleted file mode 100644
index 8316d1db99b..00000000000
--- a/Resources/Prototypes/Body/Prototypes/kobold.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# _CorvaxNext - this is just a copy of human body but with animal organs.
-- type: body
-  id: Kobold
-  name: "Kobold"
-  root: torso
-  slots:
-    head:
-      part: HeadKobold
-      connections:
-      - torso
-      organs:
-        brain: OrganAnimalBrain
-        eyes: OrganAnimalEyes
-    torso:
-      part: TorsoKobold
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        kidneys: OrganAnimalKidneys
-    right arm:
-      part: RightArmKobold
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmKobold
-      connections:
-      - left hand
-    right hand:
-      part: RightHandKobold
-    left hand:
-      part: LeftHandKobold
-    right leg:
-      part: RightLegKobold
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegKobold
-      connections:
-      - left foot
-    right foot:
-      part: RightFootKobold
-    left foot:
-      part: LeftFootKobold
diff --git a/Resources/Prototypes/Body/Prototypes/monkey.yml b/Resources/Prototypes/Body/Prototypes/monkey.yml
deleted file mode 100644
index e9a1655ec7a..00000000000
--- a/Resources/Prototypes/Body/Prototypes/monkey.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# _CorvaxNext - this is just a copy of human body but with animal organs.
-- type: body
-  id: Monkey
-  name: "Monkey"
-  root: torso
-  slots:
-    head:
-      part: HeadMonkey
-      connections:
-      - torso
-      organs:
-        brain: OrganAnimalBrain
-        eyes: OrganAnimalEyes
-    torso:
-      part: TorsoMonkey
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        kidneys: OrganAnimalKidneys
-    right arm:
-      part: RightArmMonkey
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmMonkey
-      connections:
-      - left hand
-    right hand:
-      part: RightHandMonkey
-    left hand:
-      part: LeftHandMonkey
-    right leg:
-      part: RightLegMonkey
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegMonkey
-      connections:
-      - left foot
-    right foot:
-      part: RightFootMonkey
-    left foot:
-      part: LeftFootMonkey
diff --git a/Resources/Prototypes/Body/Prototypes/moth.yml b/Resources/Prototypes/Body/Prototypes/moth.yml
index 4d80ebf803a..b3271834417 100644
--- a/Resources/Prototypes/Body/Prototypes/moth.yml
+++ b/Resources/Prototypes/Body/Prototypes/moth.yml
@@ -23,7 +23,6 @@
       - left arm
       - right leg
       - left leg
-      - head
     right arm:
       part: RightArmMoth
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/primate.yml b/Resources/Prototypes/Body/Prototypes/primate.yml
index 4e73003b672..2af9273be4c 100644
--- a/Resources/Prototypes/Body/Prototypes/primate.yml
+++ b/Resources/Prototypes/Body/Prototypes/primate.yml
@@ -3,19 +3,11 @@
   name: "primate"
   root: torso
   slots:
-    head: # Put pun pun into a humans body
-      part: HeadAnimal
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
     torso:
       part: TorsoAnimal
       connections:
       - hands
       - legs
-      - head
       organs:
         lungs: OrganAnimalLungs
         stomach: OrganAnimalStomach
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/rat.yml b/Resources/Prototypes/Body/Prototypes/rat.yml
similarity index 100%
rename from Resources/Prototypes/Body/Prototypes/Animal/rat.yml
rename to Resources/Prototypes/Body/Prototypes/rat.yml
diff --git a/Resources/Prototypes/Body/Prototypes/reptilian.yml b/Resources/Prototypes/Body/Prototypes/reptilian.yml
index 97f9956b770..1e9ebd54a48 100644
--- a/Resources/Prototypes/Body/Prototypes/reptilian.yml
+++ b/Resources/Prototypes/Body/Prototypes/reptilian.yml
@@ -23,7 +23,6 @@
       - left arm
       - right leg
       - left leg
-      - head
     right arm:
       part: RightArmReptilian
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/skeleton.yml b/Resources/Prototypes/Body/Prototypes/skeleton.yml
index 998d01cc499..16d08365610 100644
--- a/Resources/Prototypes/Body/Prototypes/skeleton.yml
+++ b/Resources/Prototypes/Body/Prototypes/skeleton.yml
@@ -14,7 +14,6 @@
       - left arm
       - right leg
       - left leg
-      - head
     right arm:
       part: RightArmSkeleton
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/slime.yml b/Resources/Prototypes/Body/Prototypes/slime.yml
index df246bb0d23..b57c5eceb44 100644
--- a/Resources/Prototypes/Body/Prototypes/slime.yml
+++ b/Resources/Prototypes/Body/Prototypes/slime.yml
@@ -14,7 +14,6 @@
       - left arm
       - right leg
       - left leg
-      - head
       organs:
         core: SentientSlimeCore
         lungs: OrganSlimeLungs
diff --git a/Resources/Prototypes/Body/Prototypes/vox.yml b/Resources/Prototypes/Body/Prototypes/vox.yml
index 42cbb7e0855..2a1f6d9dca7 100644
--- a/Resources/Prototypes/Body/Prototypes/vox.yml
+++ b/Resources/Prototypes/Body/Prototypes/vox.yml
@@ -17,7 +17,6 @@
       - left arm
       - right leg
       - left leg
-      - head
       organs:
         heart: OrganHumanHeart
         lungs: OrganVoxLungs
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index e63fc72051f..0b7025afb8c 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -7,12 +7,11 @@
   - type: StorageFill
     contents:
       - id: Hemostat
-      - id: SawElectric # Shitmed Change
+      - id: Saw
       - id: Drill
       - id: Cautery
       - id: Retractor
       - id: Scalpel
-      - id: BoneGel # _CorvaxNext: surgery
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
@@ -30,7 +29,6 @@
       - id: ScalpelAdvanced
       - id: ClothingHandsGlovesNitrile
       - id: EmergencyRollerBedSpawnFolded
-      - id: BoneGel # _CorvaxNext: surgery
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
index c0c14e91685..fe04f72899a 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -65,13 +65,9 @@
       - id: Retractor
       - id: Cautery
       - id: Drill
-      - id: SawElectric # Shitmed Change
+      - id: Saw
       - id: Hemostat
-      # start-_CorvaxNext: surgery
-      - id: BoneGel
-      - id: BoxLatexGloves
-      - id: BoxSterileMask
-      # end-_CorvaxNext: surgery
+      - id: ClothingMaskSterile
 
 - type: entity
   id: CrateMedicalScrubs
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 7108b785a9f..5928d78a49d 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -225,7 +225,6 @@
     - id: HandheldCrewMonitor
     - id: Hypospray
     - id: MedicalTechFabCircuitboard
-    - id: MedicalBiofabMachineBoard #Corvax-Next-Surgery
     - id: MedkitFilled
     - id: RubberStampCMO
     - id: MedTekCartridge
diff --git a/Resources/Prototypes/Corvax/Body/Parts/vulpkanin.yml b/Resources/Prototypes/Corvax/Body/Parts/vulpkanin.yml
index 730b7da79be..5dc4bcef418 100644
--- a/Resources/Prototypes/Corvax/Body/Parts/vulpkanin.yml
+++ b/Resources/Prototypes/Corvax/Body/Parts/vulpkanin.yml
@@ -2,269 +2,124 @@
 # TODO BODY: Part damage
 - type: entity
   id: PartVulpkanin
-  parent: BaseItem
+  parent: [BaseItem, BasePart]
   name: "vulpkanin body part"
   abstract: true
   components:
-  - type: Damageable
-    damageContainer: OrganicPart # _CorvaxNext Change
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice #DynamicPrice
-    price: 100
-  - type: Tag
-    tags:
-      - Trash
-  # _CorvaxNext Change Start
-  - type: Gibbable
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/organ2.ogg
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 110
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 150
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 200
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-    # _CorvaxNext Change End
+    - type: Extractable
+      juiceSolution:
+        reagents:
+          - ReagentId: Fat
+            Quantity: 3
+          - ReagentId: Blood
+            Quantity: 10
 
 - type: entity
   id: TorsoVulpkanin
   name: "vulpkanin torso"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseTorso]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "torso_m"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "torso_m"
-  # _CorvaxNext Change Start
-  - type: BodyPart
-    partType: Torso
-    toolName: "a torso"
-    containerName: "torso_slot"
-  - type: ContainerContainer
-    containers:
-      torso_slot: !type:ContainerSlot {}
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 400
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  # _CorvaxNext Change End
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "torso_m"
+    - type: Extractable
+      juiceSolution:
+        reagents:
+          - ReagentId: Fat
+            Quantity: 10
+          - ReagentId: Blood
+            Quantity: 20
 
 - type: entity
   id: HeadVulpkanin
   name: "vulpkanin head"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseHead]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "head_m"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "head_m"
-  - type: BodyPart
-    partType: Head
-    vital: true
-    toolName: "a head" # _CorvaxNext Change
-  - type: Input
-    context: "ghost"
-  - type: InputMover
-  - type: GhostOnMove
-  - type: Tag
-    tags:
-      - Head
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "head_m"
+    - type: Extractable
+      juiceSolution:
+        reagents:
+          - ReagentId: Fat
+            Quantity: 5
+          - ReagentId: Blood
+            Quantity: 10
 
 - type: entity
   id: LeftArmVulpkanin
   name: "left vulpkanin arm"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseLeftArm]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_arm"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-    toolName: "a left arm" # _CorvaxNext Change
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "l_arm"
 
 - type: entity
   id: RightArmVulpkanin
   name: "right vulpkanin arm"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseRightArm]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_arm"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-    toolName: "a right arm" # _CorvaxNext Change
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "r_arm"
 
 - type: entity
   id: LeftHandVulpkanin
   name: "left vulpkanin hand"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseLeftHand]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_hand"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Left
-    toolName: "a left hand" # _CorvaxNext Change
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "l_hand"
 
 - type: entity
   id: RightHandVulpkanin
   name: "right vulpkanin hand"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseRightHand]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_hand"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Right
-    toolName: "a right hand" # _CorvaxNext Change
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "r_hand"
 
 - type: entity
   id: LeftLegVulpkanin
   name: "left vulpkanin leg"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseLeftLeg]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_leg"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-    toolName: "a left leg" # _CorvaxNext Change
-  - type: MovementBodyPart
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "l_leg"
+    - type: MovementBodyPart
+      walkSpeed : 2.7
+      sprintSpeed : 4.5
 
 - type: entity
   id: RightLegVulpkanin
   name: "right vulpkanin leg"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseRightLeg]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_leg"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-    toolName: "a right leg" # _CorvaxNext Change
-  - type: MovementBodyPart
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "r_leg"
+    - type: MovementBodyPart
+      walkSpeed : 2.7
+      sprintSpeed : 4.5
 
 - type: entity
   id: LeftFootVulpkanin
   name: "left vulpkanin foot"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseLeftFoot]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_foot"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-    toolName: "a left foot" # _CorvaxNext Change
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "l_foot"
 
 - type: entity
   id: RightFootVulpkanin
   name: "right vulpkanin foot"
-  parent: PartVulpkanin
+  parent: [PartVulpkanin, BaseRightFoot]
   components:
-  - type: Sprite
-    netsync: false
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_foot"
-  - type: Icon
-    sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right
-    toolName: "a right foot" # _CorvaxNext Change
+    - type: Sprite
+      sprite: Corvax/Mobs/Species/Vulpkanin/parts.rsi
+      state: "r_foot"
diff --git a/Resources/Prototypes/Corvax/Body/Prototypes/vulpkanin.yml b/Resources/Prototypes/Corvax/Body/Prototypes/vulpkanin.yml
index bdbfc1747af..df3f5d708d4 100644
--- a/Resources/Prototypes/Corvax/Body/Prototypes/vulpkanin.yml
+++ b/Resources/Prototypes/Corvax/Body/Prototypes/vulpkanin.yml
@@ -12,39 +12,38 @@
         eyes: OrganHumanEyes
     torso:
       part: TorsoVulpkanin
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
       organs:
         heart: OrganAnimalHeart
         lungs: OrganHumanLungs
         stomach: OrganVulpkaninStomach
         liver: OrganAnimalLiver
         kidneys: OrganHumanKidneys
-    right arm:
+      connections:
+      - right_arm
+      - left_arm
+      - right_leg
+      - left_leg
+    right_arm:
       part: RightArmVulpkanin
       connections:
-      - right hand
-    left arm:
+      - right_hand
+    left_arm:
       part: LeftArmVulpkanin
       connections:
-      - left hand
-    right hand:
+      - left_hand
+    right_hand:
       part: RightHandVulpkanin
-    left hand:
+    left_hand:
       part: LeftHandVulpkanin
-    right leg:
+    right_leg:
       part: RightLegVulpkanin
       connections:
-      - right foot
-    left leg:
+      - right_foot
+    left_leg:
       part: LeftLegVulpkanin
       connections:
-      - left foot
-    right foot:
+      - left_foot
+    right_foot:
       part: RightFootVulpkanin
-    left foot:
+    left_foot:
       part: LeftFootVulpkanin
diff --git a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml
index 3ab8d884d28..eda8f2ae8eb 100644
--- a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml
@@ -10,16 +10,3 @@
     - state: green
     - state: seniorofficer
 
-- type: entity
-  id: SpawnPointSurgeon
-  parent: SpawnPointJobBase
-  name: surgeon
-  components:
-  # Corvax-Next-surgeon-start
-  - type: SpawnPoint
-    job_id: Surgeon
-  # Corvax-Next-surgeon-end
-  - type: Sprite
-    layers:
-    - state: green
-    - state: surgeon # Corvax-Next-surgeon
diff --git a/Resources/Prototypes/Corvax/Maps/Next/astra.yml b/Resources/Prototypes/Corvax/Maps/Next/astra.yml
index d7ff295cc71..0619e46d80c 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/astra.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/astra.yml
@@ -37,7 +37,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 6 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/avrite.yml b/Resources/Prototypes/Corvax/Maps/Next/avrite.yml
index dca73fe475d..a7e88756cb2 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/avrite.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/avrite.yml
@@ -36,7 +36,6 @@
           Psychologist: [ 1, 1 ]
           Paramedic: [ 1, 1 ]
           Chemist: [ 3, 3 ]
-          Surgeon: [ 1, 1 ]
           # science
           ResearchDirector: [ 1, 1 ]
           Scientist: [ 5, 6 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/awesome.yml b/Resources/Prototypes/Corvax/Maps/Next/awesome.yml
index 2a0a114220c..a56da210a90 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/awesome.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/awesome.yml
@@ -36,7 +36,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 3, 3 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/bagel.yml b/Resources/Prototypes/Corvax/Maps/Next/bagel.yml
index 130a47ea8d3..21574156d62 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/bagel.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/bagel.yml
@@ -34,7 +34,6 @@
             MedicalIntern: [ 4, 4 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 5 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/delta.yml b/Resources/Prototypes/Corvax/Maps/Next/delta.yml
index bc927b72d00..9a36a98ccc6 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/delta.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/delta.yml
@@ -37,7 +37,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 6, 6 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/maus.yml b/Resources/Prototypes/Corvax/Maps/Next/maus.yml
index 630eb979c27..ea8c39f3da5 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/maus.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/maus.yml
@@ -38,7 +38,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [1, 1]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 3, 3 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/outpost.yml b/Resources/Prototypes/Corvax/Maps/Next/outpost.yml
index 205d17b3cf1..aad0acbeac3 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/outpost.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/outpost.yml
@@ -38,7 +38,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 3, 3 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/paper.yml b/Resources/Prototypes/Corvax/Maps/Next/paper.yml
index a8902ae510c..cc88a24dd89 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/paper.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/paper.yml
@@ -40,7 +40,6 @@
           Psychologist: [ 1, 1 ]
           Paramedic: [ 1, 1 ]
           Chemist: [ 2, 2 ]
-          Surgeon: [ 1, 1 ]
           # science
           Scientist: [ 4, 4 ]
           ResearchAssistant: [ 3, 3 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/pilgrim.yml b/Resources/Prototypes/Corvax/Maps/Next/pilgrim.yml
index 87073845d43..d08d835d17c 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/pilgrim.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/pilgrim.yml
@@ -37,7 +37,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 5 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/tushkan.yml b/Resources/Prototypes/Corvax/Maps/Next/tushkan.yml
index 2c27adc8df0..c63c16437b4 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/tushkan.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/tushkan.yml
@@ -38,7 +38,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 1, 1 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 2, 2 ]
diff --git a/Resources/Prototypes/Corvax/Species/cybernetics.yml b/Resources/Prototypes/Corvax/Species/cybernetics.yml
deleted file mode 100644
index 006924024d8..00000000000
--- a/Resources/Prototypes/Corvax/Species/cybernetics.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopLArm
-  baseSprite:
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "l_arm-combined"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopRArm
-  baseSprite:
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "r_arm-combined"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopLLeg
-  baseSprite:
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "l_leg-combined"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopRLeg
-  baseSprite:
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "r_leg-combined"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopLHand
-  baseSprite:
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "l_hand"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopRHand
-  baseSprite:
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "r_hand"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopLFoot
-  baseSprite:
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "l_foot"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopRFoot
-  baseSprite:
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/Corvax/Species/kobold.yml b/Resources/Prototypes/Corvax/Species/kobold.yml
deleted file mode 100644
index 42542c29164..00000000000
--- a/Resources/Prototypes/Corvax/Species/kobold.yml
+++ /dev/null
@@ -1,148 +0,0 @@
-- type: species
-  id: Kobold
-  name: species-name-kobold
-  roundStart: false # sad...
-  prototype: MobKobold
-  sprites: MobKoboldSprites
-  dollPrototype: MobKoboldDummy
-  skinColoration: Hues
-  defaultSkinTone: "#9a7c5a"
-  markingLimits: MobKoboldMarkingLimits
-
-- type: speciesBaseSprites
-  id: MobKoboldSprites
-  sprites:
-    Special: MobKoboldAnyMarking
-    Head: MobKoboldHead
-    Chest: MobKoboldTorso
-    Tail: MobKoboldTail
-    Eyes: MobKoboldEyes
-    HeadTop: MobKoboldHorns
-    LArm: MobKoboldLArm
-    RArm: MobKoboldRArm
-    LHand: MobKoboldLHand
-    RHand: MobKoboldRHand
-    LLeg: MobKoboldLLeg
-    RLeg: MobKoboldRLeg
-    LFoot: MobKoboldLFoot
-    RFoot: MobKoboldRFoot
-
-- type: humanoidBaseSprite
-  id: MobKoboldAnyMarking
-
-- type: humanoidBaseSprite
-  id: MobKoboldMarkingMatchSkin
-  markingsMatchSkin: true
-
-- type: humanoidBaseSprite
-  id: MobKoboldHorns
-  matchSkin: false
-  baseSprite:
-    sprite: Mobs/Customization/reptilian_parts.rsi
-    state: horns_short
-
-- type: humanoidBaseSprite
-  id: MobKoboldHead
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobKoboldHeadMale
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobKoboldHeadFemale
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobKoboldTorso
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobKoboldTorsoMale
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobKoboldTorsoFemale
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobKoboldLLeg
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobKoboldLArm
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobKoboldLHand
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobKoboldLFoot
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobKoboldRLeg
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobKoboldRArm
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobKoboldRHand
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobKoboldRFoot
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: r_foot
-
-- type: humanoidBaseSprite
-  id: MobKoboldTail
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: tail
-
-- type: humanoidBaseSprite
-  id: MobKoboldEyes
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: eyes
-
-- type: markingPoints
-  id: MobKoboldMarkingLimits
-  points:
-    Special: # the cat ear joke
-      points: 1
-      required: false
-    Chest:
-      points: 1
-      required: false
diff --git a/Resources/Prototypes/Corvax/Species/monkey.yml b/Resources/Prototypes/Corvax/Species/monkey.yml
deleted file mode 100644
index 9102ea7acfa..00000000000
--- a/Resources/Prototypes/Corvax/Species/monkey.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-- type: species
-  id: Monkey
-  name: species-name-monkey
-  roundStart: false # sad...
-  prototype: MobMonkey
-  sprites: MobMonkeySprites
-  dollPrototype: MobMonkeyDummy
-  skinColoration: Hues
-  defaultSkinTone: "#ffffff"
-  markingLimits: MobMonkeyMarkingLimits
-
-- type: speciesBaseSprites
-  id: MobMonkeySprites
-  sprites:
-    Special: MobMonkeyAnyMarking
-    Head: MobMonkeyHead
-    Chest: MobMonkeyTorso
-    Tail: MobMonkeyTail
-    Eyes: MobMonkeyEyes
-    HeadTop: MobMonkeyAnyMarking
-    LArm: MobMonkeyLArm
-    RArm: MobMonkeyRArm
-    LHand: MobMonkeyLHand
-    RHand: MobMonkeyRHand
-    LLeg: MobMonkeyLLeg
-    RLeg: MobMonkeyRLeg
-    LFoot: MobMonkeyLFoot
-    RFoot: MobMonkeyRFoot
-
-- type: humanoidBaseSprite
-  id: MobMonkeyAnyMarking
-
-- type: humanoidBaseSprite
-  id: MobMonkeyMarkingMatchSkin
-  markingsMatchSkin: true
-
-- type: humanoidBaseSprite
-  id: MobMonkeyHead
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobMonkeyHeadMale
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobMonkeyHeadFemale
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobMonkeyTorso
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobMonkeyTorsoMale
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobMonkeyTorsoFemale
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobMonkeyLLeg
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobMonkeyLArm
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobMonkeyLHand
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobMonkeyLFoot
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobMonkeyRLeg
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobMonkeyRArm
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobMonkeyRHand
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobMonkeyRFoot
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: r_foot
-
-- type: humanoidBaseSprite
-  id: MobMonkeyTail
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: tail
-
-- type: humanoidBaseSprite
-  id: MobMonkeyEyes
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: eyes
-
-- type: markingPoints
-  id: MobMonkeyMarkingLimits
-  points:
-    Special: # the cat ear joke
-      points: 1 # Corvax-Sponsors
-      required: false
-    HeadTop:
-      points: 1
-      required: false
-    Chest:
-      points: 1
-      required: false
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 95b7fa71c90..621f30dbb35 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -268,9 +268,9 @@
         - PillCanister
         - Radio
         - DiscreteHealthAnalyzer
+        - SurgeryTool
         - Dropper
       components:
-        - SurgeryTool
         - Hypospray
         - Injector
         - Pill
diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
index 1685fba88fa..9ba7c85e1e1 100644
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -129,55 +129,3 @@
     damage:
       types:
         Blunt: 200
-
-# _CorvaxNext Change Start
-
-- type: entity
-  name: bang severer
-  parent: BaseItem
-  id: MeleeDebugSever
-  description: sever yer parts a week from now
-  suffix: DEBUG
-  components:
-  - type: Tag
-    tags:
-      - Debug
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/debug.rsi
-    state: icon
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 20000
-    clickPartDamageMultiplier: 10
-  - type: Item
-    size: Tiny
-    sprite: Objects/Weapons/Melee/debug.rsi
-
-- type: entity
-  name: bang severer 100dmg
-  parent: MeleeDebugSever
-  id: MeleeDebugSever100
-  components:
-  - type: Tag
-    tags:
-      - Debug
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 100
-
-- type: entity
-  name: bang severer 200dmg
-  parent: MeleeDebugSever
-  id: MeleeDebugSever200
-  components:
-  - type: Tag
-    tags:
-      - Debug
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 200
-
-# _CorvaxNext Change End
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
index 9a42088cd97..870a7cf7d75 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
@@ -81,7 +81,7 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_shoulder
-
+    
 - type: marking
   id: GauzeStomach
   bodyPart: Chest
@@ -179,7 +179,7 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_upperleg_r
-
+    
 - type: marking
   id: GauzeLowerLegRight
   bodyPart: RFoot
@@ -193,7 +193,7 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lowerleg_r
-
+    
 - type: marking
   id: GauzeBoxerWrapRight
   bodyPart: RHand
@@ -207,7 +207,7 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_boxerwrap_r
-
+    
 - type: marking
   id: GauzeBoxerWrapLeft
   bodyPart: LHand
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
index 6a9e97a0023..19768f8dc23 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -262,7 +262,7 @@
   id: LizardHornsArgali
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Kobold] # backmen: species
+  speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_argali
@@ -271,7 +271,7 @@
   id: LizardHornsAyrshire
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Kobold] # backmen: species
+  speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_ayrshire
@@ -280,7 +280,7 @@
   id: LizardHornsMyrsore
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Kobold] # backmen: species
+  speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_myrsore
@@ -289,7 +289,7 @@
   id: LizardHornsBighorn
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Kobold] # backmen: species
+  speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_bighorn
@@ -298,7 +298,7 @@
   id: LizardHornsDemonic
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Kobold] # backmen: species
+  speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_demonic
@@ -307,7 +307,7 @@
   id: LizardHornsKoboldEars
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Kobold] # backmen: species
+  speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_kobold_ears
@@ -316,7 +316,7 @@
   id: LizardHornsFloppyKoboldEars
   bodyPart: HeadSide
   markingCategory: HeadSide
-  speciesRestriction: [Reptilian, Kobold] # backmen: species
+  speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_floppy_kobold_ears
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 1c780713d62..b258581ac7e 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -248,7 +248,6 @@
         Heat: 10 # capable of touching light bulbs and stoves without feeling pain!
   - type: TTS # Corvax-TTS
     voice: TrainingRobot
-  - type: Targeting # Corvax-Next-Surgery
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 2ebe6136461..7bcb4ff8244 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -72,10 +72,8 @@
   components:
   - type: BorgSwitchableType
     selectedBorgType: medical
-  - type: SurgeryTarget
   - type: TTS # Corvax-TTS
     voice: TrainingRobot
-  - type: Sanitized
 
 - type: entity
   id: BorgChassisService
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index f2470566211..e71902db6b0 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -385,8 +385,7 @@
         damageType: Blunt
         damage: 10
       behaviors:
-      - !type:GibBehavior
-        gibContents: Skip
+      - !type:GibBehavior { }
   - type: NonSpreaderZombie
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
@@ -565,8 +564,6 @@
     interfaces:
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui # _CorvaxNext: surgery
   - type: InventorySlots
   - type: Inventory
     speciesId: hamster
@@ -597,7 +594,7 @@
           32:
             sprite: Mobs/Animals/mothroach/displacement.rsi
             state: neck
-  - type: SurgeryTarget # _CorvaxNext: surgery
+
 
 # Note that the mallard duck is actually a male drake mallard, with the brown duck being the female variant of the same species, however ss14 lacks sex specific textures
 # The white duck is more akin to a pekin or call duck.
@@ -673,13 +670,6 @@
   - type: NpcFactionMember
     factions:
     - Passive
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
-  # end-_CorvaxNext: surgery
 
 - type: entity
   name: white duck #Quack
@@ -860,11 +850,6 @@
     - Passive
   - type: Body
     prototype: AnimalRuminant
-  - type: SurgeryTarget # _CorvaxNext
-  - type: UserInterface # _CorvaxNext
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: HTN
     rootTask:
       task: RuminantCompound
@@ -940,13 +925,6 @@
       task: RuminantCompound
   - type: Body
     prototype: AnimalHemocyanin
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
-  # end-_CorvaxNext: surgery
 
 - type: entity
   name: goat
@@ -1049,11 +1027,6 @@
   - type: HTN
     rootTask:
       task: RuminantHostileCompound
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
 
 # Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked.
 - type: entity
@@ -1264,11 +1237,7 @@
   description: The genetic bipedal ancestor of... Uh... Something. Yeah, there's definitely something on the station that descended from whatever this is.
   abstract: true
   components:
-  - type: HumanoidAppearance
-    species: Monkey # backmen: species
   - type: CombatMode
-  - type: SurgeryTarget
-  - type: Targeting
   - type: Inventory
     templateId: monkey
     speciesId: monkey
@@ -1290,52 +1259,27 @@
         layer:
         - MobLayer
   - type: Stripping
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: Sprite
     drawdepth: Mobs
     layers:
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
-    - map: [ "enum.HumanoidVisualLayers.Snout" ]
-    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-    - map: ["jumpsuit"]
-    - map: ["enum.HumanoidVisualLayers.LFoot"]
-    - map: ["enum.HumanoidVisualLayers.RFoot"]
-    - map: ["enum.HumanoidVisualLayers.LHand"]
-    - map: ["enum.HumanoidVisualLayers.RHand"]
-    - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: monkey
+      sprite: Mobs/Animals/monkey.rsi
+    - map: [ "jumpsuit" ]
+    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
       color: "#ffffff"
       sprite: Objects/Misc/handcuffs.rsi
       state: body-overlay-2
       visible: false
-    - map: [ "gloves" ]
-    - map: [ "shoes" ]
     - map: [ "ears" ]
     - map: [ "outerClothing" ]
-    - map: [ "eyes" ]
-    - map: [ "belt" ]
     - map: [ "id" ]
-    - map: [ "neck" ]
-    - map: [ "back" ]
-    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-    - map: [ "enum.HumanoidVisualLayers.Hair" ]
-    - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
-    - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-    - map: [ "enum.HumanoidVisualLayers.Tail" ]
     - map: [ "mask" ]
     - map: [ "head" ]
-    - map: [ "pocket1" ]
-    - map: [ "pocket2" ]
+    - map: [ "clownedon" ]
+      sprite: "Effects/creampie.rsi"
+      state: "creampie_human"
+      visible: false
   - type: Hands
   - type: ComplexInteraction
   - type: GenericVisualizer
@@ -1345,8 +1289,8 @@
           True: {visible: true}
           False: {visible: false}
   - type: Body
-    prototype: Monkey
-    requiredLegs: 2 # finally 2 legs
+    prototype: Primate
+    requiredLegs: 1 # TODO: More than 1 leg
   - type: CreamPied
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
@@ -1496,11 +1440,6 @@
   - type: NameIdentifier
     group: Kobold
   - type: LizardAccent
-  - type: HumanoidAppearance
-    species: Kobold
-  - type: Body
-    prototype: Kobold
-    requiredLegs: 2 # finally 2 legs
   - type: ReplacementAccent
     accent: kobold
   - type: Speech
@@ -1547,6 +1486,47 @@
     coldDamageThreshold: 285
     currentTemperature: 310.15
     specificHeat: 42
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      sprite: Mobs/Animals/kobold.rsi
+      state: kobold
+    - map: [ "outline" ]
+      sprite: Mobs/Animals/kobold.rsi
+      state: outline
+    - map: [ "horns" ]
+      sprite: Mobs/Customization/reptilian_parts.rsi
+      state: horns_short
+    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
+    - map: [ "ears" ]
+    - map: [ "id" ]
+    - map: [ "mask" ]
+    - map: [ "head" ]
+    - map: [ "clownedon" ]
+      sprite: "Effects/creampie.rsi"
+      state: "creampie_human"
+      visible: false
+  - type: RandomSprite
+    getAllGroups: true
+    available:
+      - enum.DamageStateVisualLayers.Base:
+          kobold: KoboldColors
+      - horns:
+          horns_curled: KoboldHornColors
+          horns_ram: KoboldHornColors
+          horns_short: KoboldHornColors
+          horns_myrsore: KoboldHornColors
+          horns_bighorn: KoboldHornColors
+          horns_argali: KoboldHornColors
+          horns_ayrshire: KoboldHornColors
+          horns_floppy_kobold_ears: Inherit
+          horns_double: Inherit
+          horns_kobold_ears: Inherit
   - type: Butcherable
     butcheringType: Spike
     spawned:
@@ -1792,13 +1772,6 @@
       Taco: RatTaco
       Burger: RatBurger
       Skewer: RatSkewer
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
-  # end-_CorvaxNext: surgery
 
 - type: entity
   parent: MobMouse
@@ -2412,13 +2385,6 @@
       groups:
         Brute: -0.07
         Burn: -0.07
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
-  # end-_CorvaxNext: surgery
 
 - type: entity
   parent: MobSpiderBase
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 3d00cebd181..45a45e89957 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -85,15 +85,6 @@
       interactFailureString: petting-failure-carp
       interactFailureSound:
         path: /Audio/Effects/bite.ogg
-    # start-backmen: surgery
-    - type: Body
-      prototype: Carp
-    - type: SurgeryTarget
-    - type: UserInterface
-      interfaces:
-        enum.SurgeryUIKey.Key:
-          type: SurgeryBui
-    # end-backmen: surgery
 
 - type: entity
   parent: BaseMobCarp
@@ -259,11 +250,6 @@
         types:
           Slash: 10
           Bloodloss: 5
-    - type: SurgeryTarget
-    - type: UserInterface
-      interfaces:
-        enum.SurgeryUIKey.Key:
-          type: SurgeryBui
 
 - type: entity
   id: MobSharkSalvage
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 27e8cb6c05d..4ecb9e5b466 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -126,13 +126,6 @@
   - type: Sharp
   - type: TTS # Corvax-TTS
     voice: Rat
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
-  # end-_CorvaxNext: surgery
 
 - type: entity
   id: MobRatKingBuff
@@ -210,11 +203,7 @@
     - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
       state: eyes
       shader: unshaded
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
+
   - type: SpriteMovement
     movementLayers:
       movement:
@@ -307,9 +296,6 @@
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
-  - type: Food
-  - type: Item
-    size: Tiny # _CorvaxNext - Make them edible and pickable.
 
 - type: weightedRandomEntity
   id: RatKingLoot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index f7988c3abdf..af0bbd3b508 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -112,13 +112,6 @@
     speechSounds: Slime
   - type: TypingIndicator
     proto: slime
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
-  # end-_CorvaxNext: surgery
 
 - type: entity
   name: basic slime
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index 7b0ab49554f..bd8714b4b5c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -2,12 +2,6 @@
 
 - type: randomHumanoidSettings
   id: EventHumanoid
-  # start-backmen: species
-  speciesBlacklist:
-  - Resomi # Corvax-Next-Resomi
-  - Monkey
-  - Kobold
-  # end-backmen: species
   components:
     - type: RandomHumanoidAppearance
       randomizeName: false
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 4a27bc59eaa..2b27e9263de 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -96,7 +96,6 @@
         layer:
         - MobLayer
   - type: FloorOcclusion
-  - type: Mood
   - type: RangedDamageSound
     soundGroups:
       Brute:
@@ -188,8 +187,6 @@
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
-      enum.SurgeryUIKey.Key: # _CorvaxNext: surgery
-        type: SurgeryBui
   - type: Puller
   - type: Speech
     speechSounds: Alto
@@ -214,10 +211,6 @@
     - FootstepSound
     - DoorBumpOpener
     - AnomalyHost
-  - type: Targeting # _CorvaxNext: surgery
-  - type: SurgeryTarget # _CorvaxNext: surgery
-  - type: LayingDown # _CorvaxNext: LayingDown Laying Down
-  - type: AutoCryoSleepable # Corvax-Next-AutoCryo
 
 - type: entity
   save: false
@@ -230,7 +223,6 @@
   id: BaseMobSpeciesOrganic
   abstract: true
   components:
-  - type: Targeting # _CorvaxNext: surgery
   - type: OfferItem # Corvax-Next-Offer
   - type: Barotrauma
     damage:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index b5a625aa66e..229c2da027e 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -39,8 +39,7 @@
         !type:DamageTrigger
         damage: 150
       behaviors:
-      - !type:GibBehavior
-        gibContents: Skip
+      - !type:GibBehavior { }
   - type: SlowOnDamage #modified speeds because they're so weak
     speedModifierThresholds:
       60: 0.9
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 0b71a908f58..469a92092d2 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -33,8 +33,6 @@
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
-      enum.SurgeryUIKey.Key: # _CorvaxNext: surgery
-        type: SurgeryBui
   # to prevent bag open/honk spam
   - type: UseDelay
     delay: 0.5
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 02a5b07623a..718d1ad8e3f 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -78,13 +78,6 @@
   - type: DeleteOnTrigger
   - type: StaticPrice
     price: 0
-  - type: Scalpel # _CorvaxNext
-    speed: 0.45
-  - type: SurgeryTool # _CorvaxNext
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/scalpel2.ogg
 
 - type: entity
   parent: ShardBase
diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
index 45f90f9603b..55117e63602 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -42,13 +42,6 @@
     damage:
       types:
         Piercing: 3
-  - type: Tending # Shitmed
-    speed: 0.55
-  - type: SurgeryTool # Shitmed
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
 
 #TODO: I want the luxury pen to write a cool font like Merriweather in the future.
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
index e7e112fc445..e735b2dcddc 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -8,13 +8,6 @@
   - type: Item # TODO add inhand sprites for all utensils
     sprite: Objects/Misc/utensils.rsi
   - type: SpaceGarbage
-  - type: Tweezers # _CorvaxNext: Any utensil can poorly remove organs
-    speed: 0.2
-  - type: SurgeryTool # _CorvaxNext
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/hemostat1.ogg
 
 - type: entity
   parent: UtensilBase
@@ -57,8 +50,6 @@
     damage:
       types:
         Piercing: 5
-  - type: Tweezers # _CorvaxNext: Forks are better than spoons
-    speed: 0.35
 
 - type: entity
   parent: UtensilBasePlastic
@@ -71,8 +62,6 @@
   - type: Utensil
     types:
     - Fork
-  - type: Tweezers # _CorvaxNext: Forks are better than spoons
-    speed: 0.35
 
 - type: entity
   parent: UtensilBase
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index ab37f932bb4..727c75c8794 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -40,15 +40,6 @@
   - type: Item
     sprite: Objects/Tools/Hydroponics/clippers.rsi
     storedRotation: -90
-  - type: Retractor # _CorvaxNext: Same as wirecutters
-    speed: 0.35
-  - type: Hemostat
-    speed: 0.6
-  - type: SurgeryTool # _CorvaxNext
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/retractor2.ogg
 
 - type: entity
   name: scythe
@@ -96,11 +87,6 @@
         Piercing: 2
   - type: Item
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
-  - type: BoneSaw # _CorvaxNext
-    speed: 0.35
-  - type: SurgeryTool # _CorvaxNext
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/saw.ogg
 
 - type: entity
   name: spade
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 728f3956994..5b0c97dc837 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -1,5 +1,3 @@
-# Im not even gonna bother marking this file with _CorvaxNext Change(s), I'm fucking with almost everything.
-
 # Base
 
 - type: entity
@@ -10,10 +8,9 @@
   - type: Sprite
   - type: StaticPrice
     price: 20
-  - type: Tag # _CorvaxNext: surgery
-    tags: # _CorvaxNext: surgery
-    - SurgeryTool # _CorvaxNext: surgery
-  - type: SurgeryTool # _CorvaxNext: surgery
+  - type: Tag
+    tags:
+    - SurgeryTool
 
 # Cautery
 
@@ -24,10 +21,10 @@
   description: A surgical tool used to cauterize open wounds.
   components:
   - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
     state: cautery
   - type: Item
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
     storedRotation: 90
   - type: MeleeWeapon
     damage:
@@ -35,18 +32,6 @@
         Heat: 5
     soundHit:
       path: /Audio/Effects/lightburn.ogg
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Medical/Surgery/cautery1.ogg
-    endSound:
-      path: /Audio/Medical/Surgery/cautery2.ogg
-  - type: Cautery
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - Cautery
-  # end-_CorvaxNext: surgery
 
 # Drill
 
@@ -57,10 +42,10 @@
   description: A surgical drill for making holes into hard material.
   components:
   - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi
+    sprite: Objects/Specific/Medical/Surgery/drill.rsi
     state: drill
   - type: Item
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi
+    sprite: Objects/Specific/Medical/Surgery/drill.rsi
     shape:
     - 0,0,1,0
     - 1,1,1,1
@@ -72,16 +57,6 @@
       path: /Audio/Items/drill_hit.ogg
   - type: StaticPrice
     price: 40
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/saw.ogg
-  - type: Drill
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - Drill
-  # end-_CorvaxNext: surgery
 
 # Scalpel
 
@@ -101,10 +76,10 @@
     types:
       - Knife
   - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi
+    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: scalpel
   - type: Item
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi
+    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     storedRotation: 90
   - type: MeleeWeapon
     wideAnimationRotation: 90
@@ -115,19 +90,6 @@
         Slash: 8
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/Medical/Surgery/scalpel2.ogg
-  - type: Scalpel
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - Scalpel
-  # end-_CorvaxNext: surgery
-
 
 - type: entity
   name: shiv
@@ -136,11 +98,8 @@
   description: A pointy piece of glass, abraded to an edge and wrapped in tape for a handle. # Could become a decent tool or weapon with right tool mods.
   components:
   - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: shiv
   - type: Item
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
-    storedRotation: 90
     heldPrefix: shiv
 
 - type: entity
@@ -150,18 +109,13 @@
   description: Made of more expensive materials, sharper and generally more reliable.
   components:
   - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: advanced
   - type: Item
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
-    storedRotation: 90
     heldPrefix: advanced
   - type: MeleeWeapon
     damage:
       types:
         Slash: 12
-  - type: Scalpel # _CorvaxNext
-    speed: 1.25
 
 - type: entity
   name: laser scalpel
@@ -170,23 +124,11 @@
   description: A scalpel which uses a directed laser to slice instead of a blade, for more precise surgery while also cauterizing as it cuts.
   components:
   - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: laser
   - type: Item
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
-    storedRotation: 90
     heldPrefix: laser
-  # start-_CorvaxNext: surgery
-  - type: Scalpel
-    speed: 1.5
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - ScalpelLaser
-  # end-_CorvaxNext: surgery
-  # TODO: prevent bleeding from incisions
 
-# Retractor
+# Scissors
 
 - type: entity
   name: retractor
@@ -195,80 +137,30 @@
   description: A surgical tool used to hold open incisions.
   components:
   - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
     state: retractor
   - type: Item
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
     storedRotation: 90
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/Medical/Surgery/retractor2.ogg
-  - type: Retractor
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - Retractor
-  # end-_CorvaxNext: surgery
-
-# Hemostat
 
 - type: entity
   name: hemostat
   id: Hemostat
-  parent: BaseToolSurgery # _CorvaxNext
+  parent: Retractor
   description: A surgical tool used to compress blood vessels to prevent bleeding.
   components:
   - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi # _CorvaxNext Change
     state: hemostat
   - type: Item
     heldPrefix: hemostat
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi # _CorvaxNext Change
     storedRotation: 90
-  # start-_CorvaxNext: surgery
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/Medical/Surgery/hemostat1.ogg
-  - type: Hemostat
-  - type: Tweezers
-  - type: Tending
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - Hemostat
-  # end-_CorvaxNext: surgery
-
-# Bone setter
-- type: entity
-  parent: BaseToolSurgery
-  id: Bonesetter
-  name: bone setter
-  description: Used for setting bones back into place.
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/bonesetter.rsi
-    state: bonesetter
-  - type: Item
-    sprite: Objects/Specific/Medical/Surgery/bonesetter.rsi
-  - type: BoneSetter
-
-# Bone Gel
-- type: entity
-  parent: BaseToolSurgery
-  id: BoneGel
-  name: bottle of bone gel
-  description: A container for bone gel that often needs to be refilled from a specialized machine.
-  components:
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi
-    state: bone-gel
-  - type: BoneGel
 
+  # - type: entity
+  #   name: bone setter
+  #   id: BoneSetter
+  #   parent: Retractor
+  #   description: A surgical tool used for setting bones.
+  #   components:
 # Saws
 
 - type: entity
@@ -291,20 +183,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speedModifier: 1.0
-  # start-_CorvaxNext: surgery
-  - type: MeleeWeapon
-    attackRate: 0.75
-    range: 1.35
-    damage:
-      types:
-        Blunt: 2.5
-        Slash: 6.5
-    angle: 20
-  - type: BoneSaw
-  # end-_CorvaxNext: surgery
-# --No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.--
-# No, I'm going to saw through your bones.
+# No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.
 
 - type: entity
   name: choppa
@@ -323,14 +202,8 @@
         Brute: 10
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
-  # start-_CorvaxNext: surgery
   - type: Tool
-    qualities:
-      - Sawing
     speedModifier: 0.5
-  - type: BoneSaw
-    speed: 0.5
-  # end-_CorvaxNext: surgery
 
 - type: entity
   name: circular saw
@@ -339,29 +212,17 @@
   description: For heavy duty cutting.
   components:
   - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi
-    state: circular-saw
+    state: electric
   - type: Item
-    size: Normal
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi
+    heldPrefix: electric
   - type: MeleeWeapon
     damage:
       groups:
         Brute: 15
     soundHit:
       path: /Audio/Items/drill_hit.ogg
-  # start-_CorvaxNext: surgery
   - type: Tool
-    qualities:
-      - Sawing
     speedModifier: 1.5
-  - type: BoneSaw
-    speed: 1.5
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - SawElectric
-  # end-_CorvaxNext: surgery
 
 - type: entity
   name: advanced circular saw
@@ -370,165 +231,10 @@
   description: You think you can cut anything with it.
   components:
   - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/saw.rsi
     state: advanced
   - type: Item
-    size: Normal
-    sprite: Objects/Specific/Medical/Surgery/saw.rsi
-    storedRotation: 90
     heldPrefix: advanced
   - type: MeleeWeapon
     attackRate: 1.5
-# start-_CorvaxNext: surgery
   - type: Tool
-    qualities:
-      - Sawing
     speedModifier: 2.0
-  - type: BoneSaw # _CorvaxNext
-    speed: 2
-
-# _CorvaxNext Tools
-
-- type: entity
-  name: searing tool
-  id: EnergyCautery
-  parent: Cautery
-  description: A cautery with an energy tip, also serves as a drill in its powered state.
-  components:
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi
-    state: e-cautery-on
-  - type: Item
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left-on
-      right:
-      - state: inhand-right-on
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/cautery1.ogg
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/cautery2.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Piercing: 10
-        Heat: 1
-  - type: Cautery
-    speed: 1.5
-  - type: Drill
-    speed: 1.5
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - EnergyCautery
-
-- type: entity
-  name: energy scalpel
-  id: EnergyScalpel
-  parent: Scalpel
-  description: A scalpel which uses an energy blade, also serves as a saw in its powered state.
-  components:
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi
-    state: e-scalpel-on
-  - type: Item
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left-on
-      right:
-      - state: inhand-right-on
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/scalpel2.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 10
-        Heat: 1
-  - type: Scalpel
-    speed: 1.5
-  - type: BoneSaw
-    speed: 1.5
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - EnergyScalpel
-
-- type: entity
-  name: mechanical pinches
-  id: AdvancedRetractor
-  parent: Retractor
-  description: A retractor with mechanical pinches, also serves as a hemostat in its powered state.
-  components:
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi
-    state: adv-retractor-on
-  - type: Item
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left-on
-      right:
-      - state: inhand-right-on
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/retractor2.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 6.5
-        Heat: 1
-  - type: Hemostat
-    speed: 1.5
-  - type: Retractor
-    speed: 1.5
-  - type: Tweezers
-    speed: 1.5
-  - type: Tending
-    speed: 1.5
-  - type: Tag
-    tags:
-    - SurgeryTool
-    - AdvancedRetractor
-
-- type: entity
-  name: medical multitool
-  id: OmnimedTool
-  parent: BaseToolSurgery
-  components:
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi
-    state: omnimed
-  - type: Item
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/saw.ogg
-  - type: Hemostat
-    speed: 2
-  - type: Scalpel
-    speed: 2
-  - type: Drill
-    speed: 2
-  - type: BoneSetter
-    speed: 2
-  - type: Retractor
-    speed: 2
-  - type: Cautery
-    speed: 2
-  - type: BoneGel
-    speed: 2
-  - type: BoneSaw
-    speed: 2
-  - type: Tweezers
-    speed: 2
-  - type: Tending
-    speed: 2
-# end-_CorvaxNext: surgery
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index dd0d53f898c..fb8765db132 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -708,44 +708,3 @@
 # Corvax-HiddenDesc-End
     - type: BorgModuleIcon
       icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module }
-
-# _CorvaxNext Modules
-
-- type: entity
-  id: BorgModuleSurgery
-  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: surgery cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: medical
-    - state: icon-surgery
-  - type: ItemBorgModule
-    items:
-    - Scalpel
-    - Drill
-    - Hemostat
-    - Retractor
-    - Cautery
-    - SawElectric
-    - BoneGel
-  - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: surgery-module }
-
-- type: entity
-  id: BorgModuleAdvancedSurgery
-  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: advanced surgery cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: medical
-    - state: icon-advanced-surgery
-  - type: ItemBorgModule
-    items:
-    - EnergyScalpel
-    - EnergyCautery
-    - AdvancedRetractor
-    - BoneGel
-  - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-surgery-module }
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index e90235844b8..7cc57faaa4b 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -29,16 +29,6 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 15
-  # FIXME: Used isnt actually implemented so its still unlimited.
-  # Uncomment this when its implemented, and make sure it handles StackComponent right
-  #- type: Hemostat # _CorvaxNext
-  #  speed: 0.15
-  #- type: SurgeryTool # _CorvaxNext
-  #  used: true
-  #  startSound:
-  #    path: /Audio/_CorvaxNext/Medical/Surgery/retractor1.ogg
-  #  endSound:
-  #    path: /Audio/_CorvaxNext/Medical/Surgery/hemostat1.ogg
 
 - type: entity
   id: CableHVStack
diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
index 8fb7863f902..8655d53fb61 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
@@ -41,10 +41,6 @@
     size: Normal
     shape:
     - 0,0,0,1
-  - type: Tweezers # _CorvaxNext
-    speed: 0.55
-  - type: SurgeryTool # _CorvaxNext
-    startSound: /Audio/Items/crowbar.ogg
 
 # Standard (grey) Crowbar
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index c171fb555d3..c35d67e7eb4 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -88,13 +88,6 @@
     radius: 1.1 #smallest possible
     color: orange
   - type: ItemTogglePointLight
-  - type: Cautery # _CorvaxNext
-    speed: 0.45
-  - type: SurgeryTool # _CorvaxNext
-    startSound:
-      collection: lighterOnSounds
-    endSound:
-      collection: lighterOffSounds
 
 - type: entity
   name: cheap lighter
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index 3f84647e2c9..e8601fcf355 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -41,13 +41,6 @@
     unlitIcon: match_unlit
     litIcon: match_lit
     burntIcon: match_burnt
-  - type: Cautery # _CorvaxNext
-    speed: 0.2
-  - type: SurgeryTool # _CorvaxNext
-    startSound:
-      path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg
-    endSound:
-      path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg
 
 - type: entity
   parent: Matchstick
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 57ce9d883a8..4016457263e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -43,19 +43,6 @@
       Steel: 100
   - type: StaticPrice
     price: 30
-  - type: Retractor # _CorvaxNext
-    speed: 0.35
-  - type: Hemostat # _CorvaxNext
-    speed: 0.6
-  - type: SurgeryTool # _CorvaxNext
-    startSound:
-      path: /Audio/Items/wirecutter.ogg
-      params:
-        variation: 0.125
-    endSound:
-      path: /Audio/Items/wirecutter.ogg
-      params:
-        variation: 0.125
 
 - type: entity
   name: screwdriver
@@ -100,15 +87,6 @@
       Steel: 100
   - type: StaticPrice
     price: 30
-  - type: Retractor # _CorvaxNext
-    speed: 0.45
-  - type: Tending # _CorvaxNext
-    speed: 0.65
-  - type: SurgeryTool # _CorvaxNext
-    startSound:
-      collection: Screwdriver
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/retractor2.ogg
 
 - type: entity
   name: wrench
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index f3923222a2d..197dca00ff8 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -105,13 +105,6 @@
     price: 40
   - type: IgnitionSource
     temperature: 700
-  - type: Cautery # _CorvaxNext
-    speed: 0.7
-  - type: SurgeryTool # _CorvaxNext
-    startSound:
-      collection: Welder
-    endSound:
-      collection: WelderOff
 
 - type: entity
   name: industrial welding tool
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index b83c295bc8b..dad80006f1a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -31,11 +31,6 @@
   - type: Appearance
   - type: StaticPrice
     price: 500
-  - type: Cautery # _CorvaxNext
-    speed: 0.9
-  - type: SurgeryTool # _CorvaxNext
-    endSound:
-      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
 
 - type: entity
   id: BaseWeaponPowerCell
@@ -71,11 +66,6 @@
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot
-  - type: Cautery # _CorvaxNext
-    speed: 0.9
-  - type: SurgeryTool # _CorvaxNext
-    endSound:
-      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
 
 - type: entity
   id: BaseWeaponBatterySmall
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
index 87ad78db75c..398c04aee6e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -21,10 +21,3 @@
     size: Normal
     sprite: Objects/Weapons/Melee/armblade.rsi
   - type: Prying
-  - type: Scalpel # _CorvaxNext: surgery
-    speed: 0.3
-  - type: BoneSaw # _CorvaxNext: surgery
-    speed: 0.75
-  - type: SurgeryTool # _CorvaxNext: surgery
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/saw.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
index f196b66297e..bfdd94add6c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
@@ -47,10 +47,3 @@
         maxVol: 300
   - type: UseDelay
     delay: 1
-  - type: BoneSaw # _CorvaxNext: surgery
-    speed: 0.5 # TODO: arm-mounted version becomes 0.65
-  - type: SurgeryTool # _CorvaxNext: surgery
-    startSound:
-      path: /Audio/Weapons/chainsawwield.ogg
-    endSound:
-      path: /Audio/Weapons/chainsaw.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 6ad824ee9ed..38e26cba74b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -91,17 +91,6 @@
       jobRequired:
         - SalvageSpecialist
 # Corvax-HiddenDesc-End
-  - type: Scalpel # _CorvaxNext: surgery
-    speed: 0.75
-  - type: Cautery # _CorvaxNext: surgery: you have to be very, very careful to cauterize with it
-    speed: 0.2
-  - type: SurgeryTool # _CorvaxNext: surgery
-    startSound:
-      path: /Audio/Weapons/ebladehum.ogg
-    endSound:
-      path: /Audio/Weapons/eblade1.ogg
-      params:
-        variation: 0.250
 
 - type: entity
   name: energy sword
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index d401f68c54c..69407370ce1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -49,13 +49,6 @@
     stealGroup: FireAxe
   - type: IgniteOnMeleeHit
     fireStacks: -4
-  - type: Scalpel # _CorvaxNext: surgery
-    speed: 0.3
-  - type: BoneSaw # _CorvaxNext: surgery
-    speed: 0.5
-  - type: SurgeryTool # _CorvaxNext: surgery
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/saw.ogg
 
 - type: entity
   id: FireAxeFlaming
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 9ef15d58f7c..c307d0ffbe3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -27,13 +27,6 @@
       - Slicing
     useSound:
       path: /Audio/Items/Culinary/chop.ogg
-  - type: Scalpel # _CorvaxNext: surgery
-    speed: 0.65
-  - type: SurgeryTool # _CorvaxNext: surgery
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/scalpel2.ogg
 
 - type: entity
   name: kitchen knife
@@ -81,10 +74,6 @@
     guides:
     - Chef
     - FoodRecipes
-  - type: Scalpel # _CorvaxNext: surgery
-    speed: 0.3
-  - type: BoneSaw # _CorvaxNext: surgery: Better than tg 25% because its a cleaver its meant to hack off limbs
-    speed: 0.5
 
 - type: entity
   name: combat knife
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
index 82c81e36222..3cffe6e6617 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
@@ -10,10 +10,10 @@
     - state: icon
       map: ["base"]
   - type: Appearance
-#  - type: HolidayVisuals
-#    holidays:
-#      festive:
-#      - FestiveSeason
+  - type: HolidayVisuals
+    holidays:
+      festive:
+      - FestiveSeason
   - type: GenericVisualizer
     visuals:
       enum.HolidayVisuals.Holiday:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
index 6d8437934c2..75cffd91f54 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
@@ -11,4 +11,3 @@
   - type: Icon
     sprite: Structures/Furniture/Tables/optable.rsi
     state: operating_table
-  - type: OperatingTable # _CorvaxNext
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index e8182f2ddaa..310166631ae 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -202,10 +202,6 @@
       - WetFloorSign
       - ClothingHeadHatCone
       - FreezerElectronics
-      - CassetteTape
-      - TapeRecorder
-      - PlantAnalyzer # Corvax-Next-PlantAnalyzer
-      - SnowballMaker # Corvax-Next-Snowballs
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - BoxLethalshot
@@ -356,14 +352,6 @@
       - FauxTileAstroSnow
       - OreBagOfHolding
       - DeviceQuantumSpinInverter
-      # Corvax-Next Start
-      - EnergyScalpel
-      - EnergyCautery
-      - AdvancedRetractor
-      # Corvax-Next End
-      # Corvax-Next-BluespaceHarvester-Start
-      - ArtificialBluespaceCrystal
-      # Corvax-Next-BluespaceHarvester-End
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - BoxBeanbag
@@ -535,10 +523,6 @@
       - SMESAdvancedMachineCircuitboard
       - HolopadMachineCircuitboard
       - SalvageExpeditionsComputerCircuitboard # Corvax-Cringe
-      # Corvax-Next-BluespaceHarvester-Start
-      - MachineBluespaceHarvesterCircuitboard
-      - MachineBluespaceTransitorCircuitboard
-      # Corvax-Next-BluespaceHarvester-End
       # Corvax-Next-MutableLaws-Start
       - AsimovCircuitBoard
       - CorporateCircuitBoard
@@ -552,7 +536,6 @@
       - ArtistCircuitBoard
       - NutimovCircuitBoard
       # Corvax-Next-MutableLaws-End
-      - MedicalBiofabMachineBoard #Corvax-Next-Surgery
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ShuttleGunDusterCircuitboard
@@ -624,7 +607,6 @@
     - BorgModuleHarvesting
     - BorgModuleDefibrillator
     - BorgModuleAdvancedTreatment
-    - BorgModuleSurgery # _CorvaxNext: surgery Change
     - RipleyHarness
     - RipleyLArm
     - RipleyRArm
@@ -644,13 +626,6 @@
     - HamtrLLeg
     - HamtrRLeg
     - VimHarness
-    # _CorvaxNext: surgery Change
-    - BorgModuleAdvancedSurgery
-    - JawsOfLifeLeftArm
-    - JawsOfLifeRightArm
-    - SpeedLeftLeg
-    - SpeedRightLeg
-    - BasicCyberneticEyes
   - type: MaterialStorage
     whitelist:
       tags:
@@ -824,8 +799,6 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon
-      - SecurityCyberneticEyes # _CorvaxNext: surgery Change
-      - MedicalCyberneticEyes # _CorvaxNext: surgery Change
   - type: MaterialStorage
     whitelist:
       tags:
@@ -937,7 +910,6 @@
       - MedkitRadiation
       - MedkitCombat
       - Scalpel
-      - BoneGel # _CorvaxNext
       - Retractor
       - Cautery
       - Drill
@@ -955,12 +927,6 @@
       - NTBodyBag # Corvax-Next-AdvancedBodyBags
       - PrisonerBodyBag # Corvax-Next-AdvancedBodyBags
       - RadiationBodyBag # Corvax-Next-AdvancedBodyBags
-      # _CorvaxNext: surgery Change
-      - EnergyScalpel
-      - EnergyCautery
-      - AdvancedRetractor
-      - OmnimedTool
-      - MedicalCyberneticEyes
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - SyndicateBodyBag # Corvax-Next-AdvancedBodyBags
@@ -1299,7 +1265,7 @@
       staticRecipes:
         - SheetSteel
         - SheetGlass1
-        - SheetRGlassRaw
+        - SheetRGlass
         - SheetPlasma1
         - SheetPGlass1
         - SheetRPGlass1
@@ -1325,7 +1291,7 @@
     staticRecipes:
       - SheetSteel
       - SheetGlass1
-      - SheetRGlassRaw
+      - SheetRGlass
       - SheetPlasma1
       - SheetPGlass1
       - SheetRPGlass1
diff --git a/Resources/Prototypes/EntityLists/Tools/surgery.yml b/Resources/Prototypes/EntityLists/Tools/surgery.yml
index 072a754c501..20f689d272d 100644
--- a/Resources/Prototypes/EntityLists/Tools/surgery.yml
+++ b/Resources/Prototypes/EntityLists/Tools/surgery.yml
@@ -1,14 +1,10 @@
 - type: entityList
   id: surgerytools
   entities:
-  - Scalpel
   - Cautery
   - Drill
   - ScalpelLaser
   - Retractor
   - Hemostat
-  - SawElectric
-  - Bonesetter
-  - BoneGel
-  - Saw
-# - Drapes
\ No newline at end of file
+  - SawAdvanced
+# - Drapes
diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml
index 422d7d6faab..0c7b1c781e4 100644
--- a/Resources/Prototypes/Guidebook/medical.yml
+++ b/Resources/Prototypes/Guidebook/medical.yml
@@ -7,7 +7,6 @@
   - Chemist
   - Cloning
   - Cryogenics
-  - Surgery
 
 - type: guideEntry
   id: Medical Doctor
@@ -51,31 +50,3 @@
   id: AdvancedBrute
   name: guide-entry-brute
   text: "/ServerInfo/Guidebook/Medical/AdvancedBrute.xml"
-
-- type: guideEntry
-  id: Surgery
-  name: guide-entry-surgery
-  text: "/ServerInfo/Corvax/Guidebook/Medical/Surgery.xml"
-  children:
-  - Part Manipulation
-  - Organ Manipulation
-  - Utility Surgeries
-
-- type: guideEntry
-  id: Part Manipulation
-  name: guide-entry-partmanipulation
-  text: "/ServerInfo/Corvax/Guidebook/Medical/PartManipulation.xml"
-  filterEnabled: true
-
-- type: guideEntry
-  id: Organ Manipulation
-  name: guide-entry-organmanipulation
-  text: "/ServerInfo/Corvax/Guidebook/Medical/OrganManipulation.xml"
-  filterEnabled: true
-
-- type: guideEntry
-  id: Utility Surgeries
-  name: guide-entry-utilitysurgeries
-  text: "/ServerInfo/Corvax/Guidebook/Medical/UtilitySurgeries.xml"
-  filterEnabled: true
-
diff --git a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
index 25db9e96cf6..19875f7e1bf 100644
--- a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
@@ -1,127 +1,60 @@
 - type: inventoryTemplate
   id: monkey
   slots:
-    - name: jumpsuit
-      slotTexture: uniform
-      slotFlags: INNERCLOTHING
-      stripTime: 6
-      uiWindowPos: 0,1
-      strippingWindowPos: 0,2
-      displayName: Jumpsuit
-    - name: outerClothing
-      slotTexture: suit
-      slotFlags: OUTERCLOTHING
-      stripTime: 6
-      uiWindowPos: 1,1
-      strippingWindowPos: 1,2
-      displayName: Suit
-      #backmen:underclothing-start ERP ???
-    # - name: undershirt
-    #   slotTexture: undershirt
-    #   slotFlags: UNDERSHIRT
-    #   stripTime: 8
-    #   uiWindowPos: 4,1
-    #   strippingWindowPos: 3,1
-    #   displayName: Undershirt
-    # - name: underpants
-    #   slotTexture: underpants
-    #   slotFlags: UNDERPANTS
-    #   stripTime: 12
-    #   uiWindowPos: 4,0
-    #   strippingWindowPos: 3,2
-    #   displayName: Underpants
-    # - name: socks
-    #   slotTexture: socks
-    #   slotFlags: SOCKS
-    #   stripTime: 8
-    #   uiWindowPos: 4,2
-    #   strippingWindowPos: 3,3
-    #   displayName: Socks
-      #backmen:underclothing-end
-    - name: mask
-      slotTexture: mask
-      slotFlags: MASK
-      uiWindowPos: 1,2
-      strippingWindowPos: 1,1
-      displayName: Mask
-    - name: eyes
-      slotTexture: glasses
-      slotFlags: EYES
-      stripTime: 3
-      uiWindowPos: 0,3
-      strippingWindowPos: 0,0
-      displayName: Eyes
-    - name: ears
-      slotTexture: ears
-      slotFlags: EARS
-      stripTime: 3
-      uiWindowPos: 2,2
-      strippingWindowPos: 2,0
-      displayName: Ears
-    - name: head
-      slotTexture: head
-      slotFlags: HEAD
-      uiWindowPos: 1,3
-      strippingWindowPos: 1,0
-      displayName: Head
-    - name: pocket1
-      slotTexture: pocket
-      fullTextureName: template_small
-      slotFlags: POCKET
-      slotGroup: MainHotbar
-      stripTime: 3
-      uiWindowPos: 0,3
-      strippingWindowPos: 0,4
-      dependsOn: jumpsuit
-      displayName: Pocket 1
-      stripHidden: true
-    - name: pocket2
-      slotTexture: pocket
-      fullTextureName: template_small
-      slotFlags: POCKET
-      slotGroup: MainHotbar
-      stripTime: 3
-      uiWindowPos: 2,3
-      strippingWindowPos: 1,4
-      dependsOn: jumpsuit
-      displayName: Pocket 2
-      stripHidden: true
-    - name: suitstorage
-      slotTexture: suit_storage
-      slotFlags:   SUITSTORAGE
-      slotGroup: MainHotbar
-      stripTime: 3
-      uiWindowPos: 2,0
-      strippingWindowPos: 2,5
-      dependsOn: outerClothing
-      dependsOnComponents:
-      - type: AllowSuitStorage
-      displayName: Suit Storage
-    - name: id
-      slotTexture: id
-      fullTextureName: template_small
-      slotFlags: IDCARD
-      slotGroup: SecondHotbar
-      stripTime: 6
-      uiWindowPos: 2,1
-      strippingWindowPos: 2,4
-      dependsOn: jumpsuit
-      displayName: ID
-    - name: belt
-      slotTexture: belt
-      fullTextureName: template_small
-      slotFlags: BELT
-      slotGroup: SecondHotbar
-      stripTime: 6
-      uiWindowPos: 3,1
-      strippingWindowPos: 1,5
-      displayName: Belt
-    - name: back
-      slotTexture: back
-      fullTextureName: template_small
-      slotFlags: BACK
-      slotGroup: SecondHotbar
-      stripTime: 6
-      uiWindowPos: 3,0
-      strippingWindowPos: 0,5
-      displayName: Back
+  - name: head
+    slotTexture: head
+    slotFlags: HEAD
+    uiWindowPos: 1,2
+    strippingWindowPos: 0,0
+    displayName: Head
+  - name: ears
+    slotTexture: ears
+    slotFlags: EARS
+    stripTime: 3
+    uiWindowPos: 0,2
+    strippingWindowPos: 1,2
+    displayName: Ears
+  - name: mask
+    slotTexture: mask
+    slotFlags: MASK
+    uiWindowPos: 0,1
+    strippingWindowPos: 1,1
+    displayName: Mask
+  - name: jumpsuit
+    slotTexture: uniform
+    slotFlags: INNERCLOTHING
+    stripTime: 6
+    uiWindowPos: 1,0
+    strippingWindowPos: 0,2
+    displayName: Jumpsuit
+  - name: id
+    slotTexture: id
+    fullTextureName: template_small
+    slotFlags: IDCARD
+    slotGroup: SecondHotbar
+    stripTime: 6
+    uiWindowPos: 2,1
+    strippingWindowPos: 2,4
+    dependsOn: jumpsuit
+    displayName: ID
+  - name: suitstorage
+    slotTexture: suit_storage
+    slotFlags:   SUITSTORAGE
+    slotGroup: MainHotbar
+    stripTime: 3
+    uiWindowPos: 2,0
+    strippingWindowPos: 2,5
+    dependsOn: outerClothing
+    dependsOnComponents:
+    - type: AllowSuitStorage
+    displayName: Suit Storage
+  - name: outerClothing
+    slotTexture: suit
+    slotFlags: OUTERCLOTHING
+    stripTime: 6
+    uiWindowPos: 1,1
+    strippingWindowPos: 1,3
+    displayName: Suit
+    whitelist:
+      tags:
+        - MonkeyWearable
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 1a566fac39e..9ef508feead 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -243,13 +243,23 @@
         - !type:ReagentThreshold
           reagent: NitrousOxide
           min: 0.2
-          max: 0.5
         - !type:OrganType
           type: Slime
           shouldHave: false
         emote: Laugh
         showInChat: true
         probability: 0.1
+      - !type:Emote
+        conditions:
+        - !type:ReagentThreshold
+          reagent: NitrousOxide
+          min: 0.2
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
+        emote: Scream
+        showInChat: true
+        probability: 0.01
       - !type:PopupMessage
         conditions:
         - !type:ReagentThreshold
@@ -276,13 +286,13 @@
         conditions:
         - !type:ReagentThreshold
           reagent: NitrousOxide
-          min: 1
+          min: 1.8
         - !type:OrganType
           type: Slime
           shouldHave: false
         key: ForcedSleep
         component: ForcedSleeping
-        time: 300 # This reeks, but I guess it works LMAO
+        time: 3
         type: Add
       - !type:HealthChange
         conditions:
diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index f6579096f6e..a4413e01ebe 100644
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -195,8 +195,3 @@
   parent: BaseBorgModuleRecipe
   id: BorgModuleHarvesting
   result: BorgModuleHarvesting
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleClowning
-  result: BorgModuleClowning
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 0be5c12fb07..4168dceb107 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -97,7 +97,6 @@
   - FatExtractorMachineCircuitboard
   - BiofabricatorMachineCircuitboard
   - BiomassReclaimerMachineCircuitboard
-  - MedicalBiofabMachineBoard #Corvax-Next-Surgery
 
 # Tier 2
 
@@ -135,6 +134,19 @@
   - PrisonerBodyBag # Corvax-Next-AdvancedBodyBags
   - RadiationBodyBag # Corvax-Next-AdvancedBodyBags
 
+- type: technology
+  id: MechanizedTreatment
+  name: research-technology-mechanized-treatment
+  icon:
+    sprite: Mobs/Silicon/chassis.rsi
+    state: medical
+  discipline: CivilianServices
+  tier: 2
+  cost: 5000
+  recipeUnlocks:
+  - BorgModuleAdvancedTreatment
+  - BorgModuleDefibrillator
+
 - type: technology
   id: AdvancedCleaning
   name: research-technology-advanced-cleaning
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index ccd764e47e1..1550660e454 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -25,10 +25,6 @@
     - type: SleepEmitSound
       snore: /Audio/Voice/Misc/silly_snore.ogg
       interval: 10
-    # start-backmen: mood
-    - type: MoodModifyTrait # Happi
-      moodId: TraitSanguine
-    # end-backmen: mood
   - !type:AddImplantSpecial
     implants: [ SadTromboneImplant ]
 
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index f39813d7ba7..cf9a10cd23c 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -14,14 +14,6 @@
   - Medical
   - Chemistry
   - Maintenance
-  special:
-    #start-_CorvaxNext: surgery
-  - !type:AddComponentSpecial
-    components:
-    #- type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 1.75
-    #end-_CorvaxNext: surgery
 
 - type: startingGear
   id: ChemistGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 79155ec2c50..c1358857ce7 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -35,12 +35,7 @@
     implants: [ MindShieldImplant ]
   - !type:AddComponentSpecial
     components:
-    - type: CommandStaff
-    #start-_CorvaxNext: surgery
-    #- type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 2.5
-    #end-_CorvaxNext: surgery
+      - type: CommandStaff
 
 - type: startingGear
   id: CMOGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index abe099530f4..42c388f9b74 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -15,14 +15,6 @@
   - Maintenance
   extendedAccess:
   - Chemistry
-  special:
-  - !type:AddComponentSpecial
-    components:
-    #start-_CorvaxNext: surgery
-    #- type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 1.75
-    #end-_CorvaxNext: surgery
 
 - type: startingGear
   id: DoctorGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index 994c2215926..92c362a545e 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -15,14 +15,6 @@
   access:
   - Medical
   - Maintenance
-  special:
-  - !type:AddComponentSpecial
-    components:
-    #start-_CorvaxNext: surgery
-    #- type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 1.5
-    #end-_CorvaxNext: surgery
 
 - type: startingGear
   id: MedicalInternGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index ec373dc43aa..166f9ac42b7 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -17,14 +17,6 @@
   - Maintenance
   extendedAccess:
   - Chemistry
-  special:
-  - !type:AddComponentSpecial
-    components:
-    #start-_CorvaxNext: surgery
-    #- type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 1.75
-    #end-_CorvaxNext: surgery
 
 - type: startingGear
   id: ParamedicGear
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 9e0e6132dd9..970acf4ed9f 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -100,7 +100,6 @@
   - MedicalIntern
   - Psychologist
   - Paramedic
-  - Surgeon # Corvax-Next-Surgeon
 
 - type: department
   id: Security
diff --git a/Resources/Prototypes/Shaders/shaders.yml b/Resources/Prototypes/Shaders/shaders.yml
index fc1382d1f58..136821efbb8 100644
--- a/Resources/Prototypes/Shaders/shaders.yml
+++ b/Resources/Prototypes/Shaders/shaders.yml
@@ -104,13 +104,3 @@
   id: Cataracts
   kind: source
   path: "/Textures/Shaders/cataracts.swsl"
-
-- type: shader
-  id: Hologram
-  kind: source
-  path: "/Textures/Shaders/hologram.swsl"
-
-- type: shader
-  id: SaturationScale
-  kind: source
-  path: "/Textures/Shaders/saturationscale.swsl"
diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml
index 63c196b95d6..f1b05d66e8d 100644
--- a/Resources/Prototypes/Species/species_weights.yml
+++ b/Resources/Prototypes/Species/species_weights.yml
@@ -5,4 +5,5 @@
     Human: 5
     Reptilian: 4
     SlimePerson: 4
+    Vulpkanin: 4 # Corvax-Vulp
     Diona: 2
diff --git a/Resources/Prototypes/_CorvaxNext/Accents/word_replacements.yml b/Resources/Prototypes/_CorvaxNext/Accents/word_replacements.yml
deleted file mode 100644
index e64030b1884..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Accents/word_replacements.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-- type: accent
-  id: ohio
-  wordReplacements:
-    accent-ohio-words-1: accent-ohio-words-replace-1
-    accent-ohio-words-2: accent-ohio-words-replace-2
-    accent-ohio-words-3: accent-ohio-words-replace-3
-    accent-ohio-words-4: accent-ohio-words-replace-4
-    accent-ohio-words-5: accent-ohio-words-replace-5
-    accent-ohio-words-6: accent-ohio-words-replace-6
-    accent-ohio-words-7: accent-ohio-words-replace-7
-    accent-ohio-words-8: accent-ohio-words-replace-8
-    accent-ohio-words-9: accent-ohio-words-replace-9
-    accent-ohio-words-10: accent-ohio-words-replace-10
-    accent-ohio-words-11: accent-ohio-words-replace-11
-    accent-ohio-words-12: accent-ohio-words-replace-12
-    accent-ohio-words-13: accent-ohio-words-replace-13
-    accent-ohio-words-14: accent-ohio-words-replace-14
-    accent-ohio-words-15: accent-ohio-words-replace-15
-    accent-ohio-words-16: accent-ohio-words-replace-16
diff --git a/Resources/Prototypes/_CorvaxNext/Alerts/categories.yml b/Resources/Prototypes/_CorvaxNext/Alerts/categories.yml
deleted file mode 100644
index 9170c5aef49..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Alerts/categories.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: alertCategory
-  id: Mood
diff --git a/Resources/Prototypes/_CorvaxNext/Alerts/mood.yml b/Resources/Prototypes/_CorvaxNext/Alerts/mood.yml
deleted file mode 100644
index fdaa979f986..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Alerts/mood.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-# Moods
-- type: alert
-  id: MoodInsane
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood_insane
-  name: alerts-mood-insane-name
-  description: alerts-mood-insane-desc
-
-- type: alert
-  id: MoodHorrible
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood1
-  name: alerts-mood-horrible-name
-  description: alerts-mood-horrible-desc
-
-- type: alert
-  id: MoodTerrible
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood2
-  name: alerts-mood-terrible-name
-  description: alerts-mood-terrible-desc
-
-- type: alert
-  id: MoodBad
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood3
-  name: alerts-mood-bad-name
-  description: alerts-mood-bad-desc
-
-- type: alert
-  id: MoodMeh
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood4
-  name: alerts-mood-meh-name
-  description: alerts-mood-meh-desc
-
-- type: alert
-  id: MoodNeutral
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood5
-  name: alerts-mood-neutral-name
-  description: alerts-mood-neutral-desc
-
-- type: alert
-  id: MoodGood
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood6
-  name: alerts-mood-good-name
-  description: alerts-mood-good-desc
-
-- type: alert
-  id: MoodGreat
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood7
-  name: alerts-mood-great-name
-  description: alerts-mood-great-desc
-
-- type: alert
-  id: MoodExceptional
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood8
-  name: alerts-mood-exceptional-name
-  description: alerts-mood-exceptional-desc
-
-- type: alert
-  id: MoodPerfect
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood9
-  name: alerts-mood-perfect-name
-  description: alerts-mood-perfect-desc
-
-- type: alert
-  id: MoodDead
-  category: Mood
-  clickEvent: !type:MoodCheckAlertEvent
-  icons:
-    - sprite: /Textures/Interface/Alerts/mood.rsi
-      state: mood_happiness_bad
-  name: alerts-mood-dead-name
-  description: alerts-mood-dead-desc
diff --git a/Resources/Prototypes/_CorvaxNext/Body/Organs/Animal/space.yml b/Resources/Prototypes/_CorvaxNext/Body/Organs/Animal/space.yml
deleted file mode 100644
index 1196d286927..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Body/Organs/Animal/space.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: entity
-  parent: OrganAnimalLungs
-  id: OrganSpaceAnimalLungs
-  name: space animal lungs
-  components:
-  - type: Organ
-    onAdd:
-    - type: RespiratorImmunity
-
-- type: entity
-  parent: OrganAnimalHeart
-  id: OrganSpaceAnimalHeart
-  name: space animal heart
-  components:
-  - type: Organ
-    onAdd:
-    - type: PressureImmunity
diff --git a/Resources/Prototypes/_CorvaxNext/Body/Organs/cybernetic.yml b/Resources/Prototypes/_CorvaxNext/Body/Organs/cybernetic.yml
deleted file mode 100644
index 019c4e2093b..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Body/Organs/cybernetic.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-- type: entity
-  parent: OrganHumanEyes
-  abstract: true
-  id: BaseCyberneticEyes
-  components:
-  - type: Cybernetics
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/IPC/organs.rsi
-    state: "eyes"
-
-- type: entity
-  parent: BaseCyberneticEyes
-  id: BasicCyberneticEyes
-  name: cybernetic eyes
-  description: A pair of cybernetic eyes that enhance your vision, and protect you from eye damage.
-  components:
-  - type: Organ
-    onAdd:
-    - type: FlashImmunity
-    - type: EyeProtection
-
-- type: entity
-  parent: BaseCyberneticEyes
-  id: SecurityCyberneticEyes
-  name: cybernetic security eyes
-  description: A pair of cybernetic eyes that enhance your vision, featuring an integrated SecHUD.
-  components:
-  - type: Organ
-    onAdd:
-    - type: FlashImmunity
-    - type: EyeProtection
-    - type: ShowJobIcons
-    - type: ShowMindShieldIcons
-    - type: ShowCriminalRecordIcons
-
-- type: entity
-  parent: BaseCyberneticEyes
-  id: MedicalCyberneticEyes
-  name: cybernetic diagnostic eyes
-  description: A pair of cybernetic eyes that enhance your vision, featuring an integrated MedHUD.
-  components:
-  - type: Organ
-    onAdd:
-    - type: FlashImmunity
-    - type: EyeProtection
-    - type: ShowHealthBars
-      damageContainers:
-      - Biological
-    - type: ShowHealthIcons
-      damageContainers:
-      - Biological
diff --git a/Resources/Prototypes/_CorvaxNext/Body/Organs/generic.yml b/Resources/Prototypes/_CorvaxNext/Body/Organs/generic.yml
deleted file mode 100644
index 9f032de0748..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Body/Organs/generic.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-- type: entity
-  parent: OrganHumanHeart
-  id: BioSynthHeart
-  name: bio-synthetic heart
-  description: This heart can be transplanted into any living organism and it will adapt to its recipient.
-
-- type: entity
-  parent: OrganHumanLiver
-  id: BioSynthLiver
-  name: bio-synthetic liver
-  description: This liver can be transplanted into any living organism and it will adapt to its recipient.
-
-- type: entity
-  parent: OrganHumanLungs
-  id: BioSynthLungs
-  name: bio-synthetic lungs
-  description: These lungs can be transplanted into any living organism and it will adapt to its recipient.
-
-- type: entity
-  parent: OrganHumanEyes
-  id: BioSynthEyes
-  name: bio-synthetic eyes
-  description: These eyes can be transplanted into any living organism and it will adapt to its recipient.
diff --git a/Resources/Prototypes/_CorvaxNext/Body/Parts/animal.yml b/Resources/Prototypes/_CorvaxNext/Body/Parts/animal.yml
deleted file mode 100644
index 1f1c278291b..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Body/Parts/animal.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-- type: entity
-  abstract: true
-  parent: PartAnimal
-  id: BaseCarpPart
-  components:
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi
-
-- type: entity
-  categories: [ HideSpawnMenu ]
-  parent: BaseCarpPart
-  id: TailCarp
-  name: carp tail
-  description: Unique glands in this tail let space carp fly in a vacuum.
-  components:
-  - type: Sprite
-    layers:
-    - state: tail
-  - type: BodyPart
-    partType: Tail
-  - type: MovementBodyPart
-    walkSpeed: 2.5
-    sprintSpeed: 3.5
-  # TODO: Make it actually needed. Legs are hardcoded to be the only parts that matter for movement.
-  # TODO: space flight stuff
-
-- type: entity
-  categories: [ HideSpawnMenu ]
-  parent: BaseCarpPart
-  id: TorsoCarp
-  name: carp torso
-  components:
-  - type: Sprite
-    layers:
-    - state: torso
-  - type: BodyPart
-    partType: Torso
diff --git a/Resources/Prototypes/_CorvaxNext/Body/Parts/resomi.yml b/Resources/Prototypes/_CorvaxNext/Body/Parts/resomi.yml
index 262effec50f..a3b03952e3b 100644
--- a/Resources/Prototypes/_CorvaxNext/Body/Parts/resomi.yml
+++ b/Resources/Prototypes/_CorvaxNext/Body/Parts/resomi.yml
@@ -1,270 +1,118 @@
-# surgery resomi
-
 - type: entity
   id: PartResomi
-  parent: BaseItem
+  parent: [BaseItem, BasePart]
   name: "resomi body part"
   abstract: true
   components:
-  - type: Damageable
-    damageContainer: OrganicPart # _CorvaxNext Change
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice #DynamicPrice
-    price: 100
-  - type: Tag
-    tags:
-      - Trash
-  # _CorvaxNext Change Start
-  - type: Gibbable
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/_CorvaxNext/Medical/Surgery/organ2.ogg
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 110
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 150
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 200
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  # _CorvaxNext Change End
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
 
 - type: entity
   id: TorsoResomi
   name: "resomi torso"
-  parent: PartResomi
+  parent: [PartHuman, BaseTorso]
   components:
   - type: Sprite
-    netsync: false
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "torso_m"
-  - type: Icon
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "torso_m"
-  - type: BodyPart
-    partType: Torso
-  # _CorvaxNext Change Start
-    toolName: "a torso"
-    containerName: "torso_slot"
-  - type: ContainerContainer
-    containers:
-      torso_slot: !type:ContainerSlot {}
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 400
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  # _CorvaxNext Change End
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
 
 - type: entity
   id: HeadResomi
   name: "resomi head"
-  parent: PartResomi
+  parent: [PartHuman, BaseHead]
   components:
   - type: Sprite
-    netsync: false
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "head_m"
-  - type: Icon
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "head_m"
-  - type: BodyPart
-    partType: Head
-    vital: true
-    toolName: "a head" # _CorvaxNext Change
-  - type: Input
-    context: "ghost"
-  - type: InputMover
-  - type: GhostOnMove
-  - type: Tag
-    tags:
-      - Head
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
 
 - type: entity
   id: LeftArmResomi
   name: "left resomi arm"
-  parent: PartResomi
+  parent: [PartHuman, BaseLeftArm]
   components:
   - type: Sprite
-    netsync: false
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "l_arm"
-  - type: Icon
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "l_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-    toolName: "a left arm" # _CorvaxNext Change
 
 - type: entity
   id: RightArmResomi
   name: "right resomi arm"
-  parent: PartResomi
+  parent: [PartHuman, BaseRightArm]
   components:
   - type: Sprite
-    netsync: false
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "r_arm"
-  - type: Icon
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "r_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-    toolName: "a right arm" # _CorvaxNext Change
 
 - type: entity
   id: LeftHandResomi
   name: "left resomi hand"
-  parent: PartResomi
+  parent: [PartHuman, BaseLeftHand]
   components:
   - type: Sprite
-    netsync: false
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "l_hand"
-  - type: Icon
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "l_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Left
-    toolName: "a left hand" # _CorvaxNext Change
 
 - type: entity
   id: RightHandResomi
   name: "right resomi hand"
-  parent: PartResomi
+  parent: [PartHuman, BaseRightHand]
   components:
   - type: Sprite
-    netsync: false
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "r_hand"
-  - type: Icon
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "r_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Right
-    toolName: "a right hand" # _CorvaxNext Change
 
 - type: entity
   id: LeftLegResomi
   name: "left resomi leg"
-  parent: PartResomi
+  parent: [PartHuman, BaseLeftLeg]
   components:
   - type: Sprite
-    netsync: false
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "l_leg"
-  - type: Icon
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "l_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-    toolName: "a left leg" # _CorvaxNext Change
-  - type: MovementBodyPart
 
 - type: entity
   id: RightLegResomi
   name: "right resomi leg"
-  parent: PartResomi
+  parent: [PartHuman, BaseRightLeg]
   components:
   - type: Sprite
-    netsync: false
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "r_leg"
-  - type: Icon
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "r_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-    toolName: "a right leg" # _CorvaxNext Change
-  - type: MovementBodyPart
 
 - type: entity
   id: LeftFootResomi
   name: "left resomi foot"
-  parent: PartResomi
+  parent: [PartHuman, BaseLeftFoot]
   components:
   - type: Sprite
-    netsync: false
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "l_foot"
-  - type: Icon
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "l_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-    toolName: "a left foot" # _CorvaxNext Change
 
 - type: entity
   id: RightFootResomi
   name: "right resomi foot"
-  parent: PartResomi
+  parent: [PartHuman, BaseRightFoot]
   components:
   - type: Sprite
-    netsync: false
-    sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
-    state: "r_foot"
-  - type: Icon
     sprite: _CorvaxNext/Mobs/Species/Resomi/parts.rsi
     state: "r_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right
-    toolName: "a right foot" # _CorvaxNext Change
diff --git a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/Animal/carp.yml b/Resources/Prototypes/_CorvaxNext/Body/Prototypes/Animal/carp.yml
deleted file mode 100644
index 81bf6a4bd5c..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/Animal/carp.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: body
-  id: Carp
-  name: carp
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - tail
-      organs:
-        lungs: OrganSpaceAnimalLungs # Immunity to airloss
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganSpaceAnimalHeart # Immunity to cold
-        kidneys: OrganAnimalKidneys
-    tail:
-      part: TailCarp
diff --git a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/cybernetic.yml b/Resources/Prototypes/_CorvaxNext/Body/Prototypes/cybernetic.yml
deleted file mode 100644
index 5a469088b25..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/cybernetic.yml
+++ /dev/null
@@ -1,171 +0,0 @@
-- type: entity
-  id: LeftArmCybernetic
-  parent: LeftArmHuman
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopLArm
-  - type: GenerateChildPart
-    id: LeftHandCybernetic
-  - type: Cybernetics
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "l_arm-combined"
-
-- type: entity
-  id: RightArmCybernetic
-  parent: RightArmHuman
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopRArm
-  - type: GenerateChildPart
-    id: RightHandCybernetic
-  - type: Cybernetics
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "r_arm-combined"
-
-- type: entity
-  id: LeftLegCybernetic
-  parent: LeftLegHuman
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopLLeg
-  - type: GenerateChildPart
-    id: LeftFootCybernetic
-  - type: Cybernetics
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "l_leg-combined"
-
-- type: entity
-  id: RightLegCybernetic
-  parent: RightLegHuman
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopRLeg
-  - type: GenerateChildPart
-    id: RightFootCybernetic
-  - type: Cybernetics
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "r_leg-combined"
-
-- type: entity
-  id: LeftHandCybernetic
-  parent: LeftHandHuman
-  name: cybernetic left hand
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopLHand
-  - type: Cybernetics
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandCybernetic
-  parent: RightHandHuman
-  name: cybernetic right hand
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopRHand
-  - type: Cybernetics
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftFootCybernetic
-  parent: LeftFootHuman
-  name: cybernetic left foot
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopLFoot
-  - type: Cybernetics
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootCybernetic
-  parent: RightFootHuman
-  name: cybernetic right foot
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopRFoot
-  - type: Cybernetics
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi
-    state: "r_foot"
-
-- type: entity
-  parent: LeftArmCybernetic
-  id: JawsOfLifeLeftArm
-  name: J.W.L left arm
-  description: A cybernetic left arm with the ability to pry doors open.
-  components:
-  - type: BodyPart
-    onAdd:
-    - type: Prying
-      speedModifier: 1.5
-      pryPowered: true
-
-- type: entity
-  parent: RightArmCybernetic
-  id: JawsOfLifeRightArm
-  name: J.W.L right arm
-  description: A cybernetic right arm with the ability to pry doors open.
-  components:
-  - type: BodyPart
-    onAdd:
-    - type: Prying
-      speedModifier: 1.5
-      pryPowered: true
-
-- type: entity
-  parent: LeftLegCybernetic
-  id: SpeedLeftLeg
-  name: S.P.E.E.D left leg
-  description: A cybernetic left leg that allows its wearer to run faster.
-  components:
-  - type: MovementBodyPart
-    walkSpeed: 3.125
-    sprintSpeed: 5.625
-  - type: BodyPart
-    onAdd:
-    - type: NoSlip
-    - type: ProtectedFromStepTriggers
-
-- type: entity
-  parent: RightLegCybernetic
-  id: SpeedRightLeg
-  name: S.P.E.E.D right leg
-  description: A cybernetic left leg that allows its wearer to run faster.
-  components:
-  - type: MovementBodyPart
-    walkSpeed: 3.125
-    sprintSpeed: 5.625
-  - type: BodyPart
-    onAdd:
-    - type: NoSlip
-    - type: ProtectedFromStepTriggers
diff --git a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/generic.yml b/Resources/Prototypes/_CorvaxNext/Body/Prototypes/generic.yml
deleted file mode 100644
index 2fb9c958915..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/generic.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-- type: entity
-  parent: LeftArmHuman
-  id: BioSynthLeftArm
-  name: bio-synthetic left arm
-  description: This left arm can be transplanted into any living organism and it will adapt to its recipient.
-  components:
-  - type: BodyPart
-    children:
-      left hand:
-        id: "left hand"
-        type: Hand
-
-- type: entity
-  parent: RightArmHuman
-  id: BioSynthRightArm
-  name: bio-synthetic right arm
-  description: This right arm can be transplanted into any living organism and it will adapt to its recipient.
-  components:
-  - type: BodyPart
-    children:
-      right hand:
-        id: "right hand"
-        type: Hand
-
-- type: entity
-  parent: LeftHandHuman
-  id: BioSynthLeftHand
-  name: bio-synthetic left hand
-  description: This left hand can be transplanted into any living organism and it will adapt to its recipient.
-
-- type: entity
-  parent: RightHandHuman
-  id: BioSynthRightHand
-  name: bio-synthetic right hand
-  description: This right hand can be transplanted into any living organism and it will adapt to its recipient.
-
-- type: entity
-  parent: LeftLegHuman
-  id: BioSynthLeftLeg
-  name: bio-synthetic left leg
-  description: This left leg can be transplanted into any living organism and it will adapt to its recipient.
-  components:
-  - type: BodyPart
-    children:
-      left foot:
-        id: "left foot"
-        type: Foot
-
-- type: entity
-  parent: RightLegHuman
-  id: BioSynthRightLeg
-  name: bio-synthetic right leg
-  description: This right leg can be transplanted into any living organism and it will adapt to its recipient.
-  components:
-  - type: BodyPart
-    children:
-      right foot:
-        id: "right foot"
-        type: Foot
-
-- type: entity
-  parent: LeftFootHuman
-  id: BioSynthLeftFoot
-  name: bio-synthetic left foot
-  description: This left foot can be transplanted into any living organism and it will adapt to its recipient.
-
-- type: entity
-  parent: RightFootHuman
-  id: BioSynthRightFoot
-  name: bio-synthetic right foot
-  description: This right foot can be transplanted into any living organism and it will adapt to its recipient.
-
-# JOKE ITEMS
-
-- type: entity
-  parent: LeftArmHuman
-  id: PizzaLeftArm
-  name: pizza left arm
-  description: For when you want to turn someone into a Space John's.
-  components:
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-    toolName: "a left arm"
-    baseLayerId: MobPizzaLArm
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  parent: RightArmHuman
-  id: PizzaRightArm
-  name: pizza right arm
-  description: For when you want to turn someone into a Space John's.
-  components:
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-    toolName: "a right arm"
-    baseLayerId: MobPizzaRArm
-  - type: Sprite
-    sprite: _CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi
-    state: "r_arm"
diff --git a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/resomi.yml b/Resources/Prototypes/_CorvaxNext/Body/Prototypes/resomi.yml
index d1bdf1f7800..e05f759162c 100644
--- a/Resources/Prototypes/_CorvaxNext/Body/Prototypes/resomi.yml
+++ b/Resources/Prototypes/_CorvaxNext/Body/Prototypes/resomi.yml
@@ -13,38 +13,37 @@
     torso:
       part: TorsoResomi
       connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
+      - right_arm
+      - left_arm
+      - right_leg
+      - left_leg
       organs:
         heart: OrganHumanHeart
         lungs: OrganHumanLungs
-        stomach: OrganAnimalStomach
-        liver:  OrganAnimalLiver
-        kidneys: OrganAnimalKidneys
-    right arm:
+        stomach: OrganHumanStomach
+        liver: OrganHumanLiver
+        kidneys: OrganHumanKidneys
+    right_arm:
       part: RightArmResomi
       connections:
-      - right hand
-    left arm:
+      - right_hand
+    left_arm:
       part: LeftArmResomi
       connections:
-      - left hand
-    right hand:
+      - left_hand
+    right_hand:
       part: RightHandResomi
-    left hand:
+    left_hand:
       part: LeftHandResomi
-    right leg:
+    right_leg:
       part: RightLegResomi
       connections:
-      - right foot
-    left leg:
+      - right_foot
+    left_leg:
       part: LeftLegResomi
       connections:
-      - left foot
-    right foot:
+      - left_foot
+    right_foot:
       part: RightFootResomi
-    left foot:
+    left_foot:
       part: LeftFootResomi
diff --git a/Resources/Prototypes/_CorvaxNext/Damage/containers.yml b/Resources/Prototypes/_CorvaxNext/Damage/containers.yml
deleted file mode 100644
index d0b21f5ad7b..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Damage/containers.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: damageContainer
-  id: OrganicPart # _CorvaxNext: surgery
-  supportedGroups:
-  - Brute
-  - Burn
diff --git a/Resources/Prototypes/_CorvaxNext/Damage/modifier_sets.yml b/Resources/Prototypes/_CorvaxNext/Damage/modifier_sets.yml
index d4868b09262..1df7d1ef0be 100644
--- a/Resources/Prototypes/_CorvaxNext/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_CorvaxNext/Damage/modifier_sets.yml
@@ -6,16 +6,4 @@
     Blunt: 1.3
     Slash: 1.3
     Piercing: 1.3
-    Shock: 1.3
-
-# _CorvaxNext: surgery
-# Change this if you want to alter how damage types affect part severing/integrity.
-- type: damageModifierSet
-  id: PartDamage
-  coefficients:
-    Blunt: 0.8
-    Slash: 1.2
-    Piercing: 0.5
-    Cold: 0.5
-    Heat: 0.8
-    Shock: 0.5
\ No newline at end of file
+    Shock: 1.3
\ No newline at end of file
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_CorvaxNext/Entities/Clothing/Belt/belts.yml
index 690428c76a0..2abe8d44fa2 100644
--- a/Resources/Prototypes/_CorvaxNext/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/_CorvaxNext/Entities/Clothing/Belt/belts.yml
@@ -21,85 +21,3 @@
     state: sheath
   - type: Clothing
     sprite: _CorvaxNext/Clothing/Belt/sheriff_sheath.rsi
-
-- type: entity
-  parent: ClothingBeltStorageBase
-  id: ClothingBeltSurgicalBoard
-  name: surgical magnetic board
-  description: Able to magnetize special surgical instruments made on Medical TechFab. Surgeon's assistant? I have my own little buddy!
-  components:
-  - type: Sprite
-    sprite: _CorvaxNext/Clothing/Belt/surgical_board.rsi
-  - type: Clothing
-    sprite: _CorvaxNext/Clothing/Belt/surgical_board.rsi
-  - type: Storage
-    whitelist:
-      tags:
-        - Hemostat
-        - Scalpel
-        - EnergyScalpel
-        - ScalpelLaser
-        - Retractor
-        - AdvancedRetractor
-        - Cautery
-        - EnergyCautery
-        - Drill
-        - SawElectric
-  - type: ItemMapper
-    mapLayers:
-      hemostat:
-        whitelist:
-          tags:
-          - Hemostat
-      scalpel:
-        whitelist:
-          tags:
-          - Scalpel
-      energyScalpel:
-        whitelist:
-          tags:
-          - EnergyScalpel
-      scalpelLaser:
-        whitelist:
-          tags:
-          - ScalpelLaser
-      retractor:
-        whitelist:
-          tags:
-          - Retractor
-      advancedRetractor:
-        whitelist:
-          tags:
-          - AdvancedRetractor
-      cautery:
-        whitelist:
-          tags:
-          - Cautery
-      energyCautery:
-        whitelist:
-          tags:
-            - EnergyCautery
-      drill:
-        whitelist:
-          tags:
-            - Drill
-      sawElectric:
-        whitelist:
-          tags:
-            - SawElectric
-    sprite: _CorvaxNext/Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
-- type: entity
-  parent: ClothingBeltSurgicalBoard
-  id: ClothingBeltSurgicalBoardFilled
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Hemostat
-      - id: Scalpel
-      - id: Retractor
-      - id: Cautery
-      - id: Drill
-      - id: SawElectric
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Machines/lathe.yml b/Resources/Prototypes/_CorvaxNext/Entities/Machines/lathe.yml
deleted file mode 100644
index 24aa6f18897..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Entities/Machines/lathe.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-- type: entity
-  id: MedicalBiofabricator
-  parent: BaseLathe
-  name: medical biofabricator
-  description: Produces organs and other organic matter that can be surgically grafted onto patients with biomass.
-  components:
-  - type: Sprite
-    sprite: _CorvaxNext/Structures/Machines/limbgrower.rsi
-    snapCardinals: true
-    layers:
-    - state: limbgrower_idleoff
-      map: ["enum.LatheVisualLayers.IsRunning"]
-#    - state: limbgrower_idleoff
-#      shader: unshaded
-#      map: ["enum.PowerDeviceVisualLayers.Powered"]
-#    - state: inserting
-#      map: ["enum.MaterialStorageVisualLayers.Inserting"]
-#    - state: panel
-#      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Machine
-    board: MedicalBiofabMachineBoard
-  - type: MaterialStorage
-    whitelist:
-      tags:
-        - Sheet
-        - RawMaterial
-  - type: Lathe
-    idleState: limbgrower_idleoff
-    runningState: limbgrower_idleon
-    staticRecipes:
-    - SynthLiver
-    - SynthHeart
-    - SynthLungs
-    - SynthEyes
-    - SynthLeftLeg
-    - SynthRightLeg
-    - SynthLeftFoot
-    - SynthRightFoot
-    - SynthLeftArm
-    - SynthRightArm
-    - SynthLeftHand
-    - SynthRightHand
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Mobs/Species/primate.yml b/Resources/Prototypes/_CorvaxNext/Entities/Mobs/Species/primate.yml
deleted file mode 100644
index cc023ee0865..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Entities/Mobs/Species/primate.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-- type: entity
-  save: false
-  parent: BaseSpeciesDummy
-  id: MobMonkeyDummy
-  categories: [ HideSpawnMenu ]
-  description: A dummy monkey meant to be used in character setup.
-  components:
-  - type: Icon
-    sprite: Mobs/Animals/monkey.rsi
-    state: full
-  - type: Appearance
-  - type: HumanoidAppearance
-    species: Monkey
-  - type: Body
-    prototype: Monkey
-    requiredLegs: 2
-  - type: UserInterface
-    interfaces:
-      enum.HumanoidMarkingModifierKey.Key: # sure, this can go here too
-        type: HumanoidMarkingModifierBoundUserInterface
-
-- type: entity
-  save: false
-  parent: BaseSpeciesDummy
-  id: MobKoboldDummy
-  categories: [ HideSpawnMenu ]
-  description: A dummy kobold meant to be used in character setup.
-  components:
-  - type: Icon
-    sprite: Mobs/Animals/kobold.rsi
-    state: full
-  - type: Appearance
-  - type: HumanoidAppearance
-    species: Kobold
-  - type: Body
-    prototype: Kobold
-    requiredLegs: 2
-  - type: UserInterface
-    interfaces:
-      enum.HumanoidMarkingModifierKey.Key: # sure, this can go here too
-        type: HumanoidMarkingModifierBoundUserInterface
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Circuitboards/production.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Circuitboards/production.yml
deleted file mode 100644
index 5f37576475a..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Circuitboards/production.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: entity
-  id: MedicalBiofabMachineBoard
-  parent: BaseMachineCircuitboard
-  name: medical biofab machine board
-  description: A machine printed circuit board for a medical biofab.
-  components:
-    - type: Sprite
-      state: medical
-    - type: MachineBoard
-      prototype: MedicalBiofabricator
-      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/pda.yml
deleted file mode 100644
index bb4b9813886..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/pda.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: entity
-  parent: BaseMedicalPDA
-  id: SurgeonPDA
-  name: surgeon PDA
-  description: Shiny and sterile.
-  components:
-  - type: Pda
-    id: SurgeonIDCard
-  - type: PdaBorderColor
-    borderColor: "#d7d7d0"
-    accentVColor: "#5db8be"
-  - type: Icon
-    state: pda-surgeon
-  - type: GuideHelp
-    guides:
-    - Medical Doctor
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Misc/identification_cards.yml
deleted file mode 100644
index 11e41eeb6db..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Misc/identification_cards.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: entity
-  parent: IDCardStandard
-  id: SurgeonIDCard
-  name: surgeon ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idsurgeon
-  - type: PresetIdCard
-    job: Surgeon
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Medical/surgery.yml
deleted file mode 100644
index 647c48b079d..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Medical/surgery.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- type: entity
-  name: скальпель
-  id: ScalpelCool
-  parent: BaseKnife
-  description: Хирургический инструмент, используемый для выполнения надрезов в плоти.
-  components:
-  - type: Tag
-    tags:
-    - Knife
-  - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
-    state: scalpel
-  - type: Item
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgeries.yml b/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgeries.yml
deleted file mode 100644
index b9efc875106..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgeries.yml
+++ /dev/null
@@ -1,693 +0,0 @@
-- type: entity
-  id: SurgeryBase
-  categories: [ HideSpawnMenu ]
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryOpenIncision
-  name: Open Incision
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    steps:
-    - SurgeryStepOpenIncisionScalpel
-    - SurgeryStepRetractSkin
-    - SurgeryStepClampBleeders
-  - type: SurgeryPartPresentCondition
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryCloseIncision
-  name: Close Incision
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    priority: 1
-    steps:
-    - SurgeryStepCloseBones
-    - SurgeryStepMendRibcage
-    - SurgeryStepCloseIncision
-  - type: SurgeryPartPresentCondition
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryOpenRibcage
-  name: Open Ribcage
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepPriseOpenBones
-  - type: SurgeryPartCondition
-    part: Torso
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryRemovePart
-  name: Remove Part
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepSawFeature
-    - SurgeryStepClampInternalBleeders
-    - SurgeryStepRemoveFeature
-  - type: SurgeryPartCondition
-    part: Torso
-    inverse: true
-
-# I fucking hate hardcoding all of this shit to accomodate for surgery BUI.
-# If anyone can give me pointers on how to make it better I'd be incredibly grateful.
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachHead
-  name: Attach Head
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: head
-    part: Head
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachLeftArm
-  name: Attach Left Arm
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: left arm
-    part: Arm
-    symmetry: Left
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachRightArm
-  name: Attach Right Arm
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: right arm
-    part: Arm
-    symmetry: Right
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachLeftLeg
-  name: Attach Left Leg
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: left leg
-    part: Leg
-    symmetry: Left
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachRightLeg
-  name: Attach Right Leg
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: right leg
-    part: Leg
-    symmetry: Right
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachLeftHand
-  name: Attach Left Hand
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Arm
-    symmetry: Left
-  - type: SurgeryPartRemovedCondition
-    connection: left hand
-    part: Hand
-    symmetry: Left
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachRightHand
-  name: Attach Right Hand
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Arm
-    symmetry: Right
-  - type: SurgeryPartRemovedCondition
-    connection: right hand
-    part: Hand
-    symmetry: Right
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachLeftFoot
-  name: Attach Left Foot
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Leg
-    symmetry: Left
-  - type: SurgeryPartRemovedCondition
-    connection: left foot
-    part: Foot
-    symmetry: Left
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachRightFoot
-  name: Attach Right Foot
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Leg
-    symmetry: Right
-  - type: SurgeryPartRemovedCondition
-    connection: right foot
-    part: Foot
-    symmetry: Right
-
-# Surgery for animals - They have a single legs/hands entity.
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachLegs
-  name: Attach Legs
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: legs
-    part: Leg
-    symmetry: None
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachHands
-  name: Attach Hands
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: hands
-    part: Hand
-    symmetry: Left # shitcode i guess because of ui icons
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachFeet
-  name: Attach Feet
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: feet
-    part: Foot
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachTail
-  name: Attach Tail
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: tail
-    part: Tail
-    #symmetry: None
-
-#- type: entity
-#  parent: SurgeryBase
-#  id: SurgeryAlienEmbryoRemoval
-#  name: Alien Embryo Removal
-#  description: Removal of an alien embryo from the body.
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: Surgery
-#    priority: -1
-#    requirement: SurgeryOpenRibcage
-#    steps:
-#    - SurgeryStepCutLarvaRoots
-#    - SurgeryStepRemoveLarva
-#  - type: SurgeryLarvaCondition
-#  - type: SurgeryPartCondition
-#    part: Torso
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryTendWoundsBrute
-  name: Tend Bruise Wounds
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    steps:
-    - SurgeryStepCarefulIncisionScalpel
-    - SurgeryStepRepairBruteTissue
-    - SurgeryStepSealTendWound
-  - type: SurgeryWoundedCondition
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryTendWoundsBurn
-  name: Tend Burn Wounds
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    steps:
-    - SurgeryStepCarefulIncisionScalpel
-    - SurgeryStepRepairBurnTissue
-    - SurgeryStepSealTendWound
-  - type: SurgeryWoundedCondition
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryInsertItem
-  name: Cavity Implant
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepInsertItem
-    - SurgeryStepRemoveItem
-  - type: SurgeryPartCondition
-    part: Torso
-
-# Note for any Organ manipulation surgeries. Most of the organs are only defined on the server.
-# I added some of them to the client too, but we should probably move them to a shared
-# prototype at some point.
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryRemoveBrain
-  name: Remove Brain
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepClampInternalBleeders
-    - SurgeryStepRemoveOrgan
-  - type: SurgeryPartCondition
-    part: Head
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Brain
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryInsertBrain
-  name: Insert Brain
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepInsertOrgan
-    - SurgeryStepSealOrganWound
-  - type: SurgeryPartCondition
-    part: Head
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Brain
-    inverse: true
-    reattaching: true
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryRemoveHeart
-  name: Remove Heart
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepClampInternalBleeders
-    - SurgeryStepRemoveOrgan
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Heart
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryInsertHeart
-  name: Insert Heart
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepInsertHeart
-    - SurgeryStepSealOrganWound
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Heart
-    inverse: true
-    reattaching: true
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryRemoveLiver
-  name: Remove Liver
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepClampInternalBleeders
-    - SurgeryStepRemoveOrgan
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Liver
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryInsertLiver
-  name: Insert Liver
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepInsertLiver
-    - SurgeryStepSealOrganWound
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Liver
-    inverse: true
-    reattaching: true
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryRemoveLungs
-  name: Remove Lungs
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepClampInternalBleeders
-    - SurgeryStepRemoveOrgan
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Lung
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryInsertLungs
-  name: Insert Lungs
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepInsertLungs
-    - SurgeryStepSealOrganWound
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Lung
-    inverse: true
-    reattaching: true
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryRemoveStomach
-  name: Remove Stomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepClampInternalBleeders
-    - SurgeryStepRemoveOrgan
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Stomach
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryInsertStomach
-  name: Insert Stomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepInsertStomach
-    - SurgeryStepSealOrganWound
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Stomach
-    inverse: true
-    reattaching: true
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryRemoveEyes
-  name: Remove Eyes
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepClampInternalBleeders
-    - SurgeryStepRemoveOrgan
-  - type: SurgeryPartCondition
-    part: Head
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Eyes
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryInsertEyes
-  name: Insert Eyes
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepSawBones
-    - SurgeryStepInsertEyes
-    - SurgeryStepSealOrganWound
-  - type: SurgeryPartCondition
-    part: Head
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Eyes
-    inverse: true
-    reattaching: true
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryLobotomize
-  name: Lobotomize
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepLobotomize
-    - SurgeryStepCloseIncision
-  - type: SurgeryComponentCondition
-    component:
-    - type: OhioAccent
-    inverse: true
-  - type: SurgeryPartCondition
-    part: Head
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryMendBrainTissue
-  name: Mend brain tissue
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepMendBrainTissue
-    - SurgeryStepCloseIncision
-  - type: SurgeryComponentCondition
-    component:
-    - type: OhioAccent
-  - type: SurgeryPartCondition
-    part: Head
-
-# Fluff/Joke Surgeries
-
-#- type: entity
-#  parent: SurgeryBase
-#  id: SurgeryAddFelinidEars
-#  name: Add cat ears
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: Surgery
-#    #requirement: SurgeryOpenIncision
-#    steps:
-#    - SurgeryStepAddFelinidEars
-#  - type: SurgeryPartCondition
-#    part: Head
-#  - type: SurgeryMarkingCondition
-#    markingCategory: HeadTop
-#    matchString: FelinidEars
-#    inverse: true
-
-#- type: entity
-#  parent: SurgeryBase
-#  id: SurgeryRemoveFelinidEars
-#  name: Remove cat ears
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: Surgery
-#    requirement: SurgeryOpenIncision
-#    steps:
-#    - SurgeryStepRemoveFelinidEars
-#  - type: SurgeryPartCondition
-#    part: Head
-#  - type: SurgeryMarkingCondition
-#    markingCategory: HeadTop
-#    matchString: FelinidEars
-
-#- type: entity
-#  parent: SurgeryBase
-#  id: SurgeryAddFelinidTail
-#  name: Add cat tail
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: Surgery
-#    requirement: SurgeryOpenIncision
-#    steps:
-#    - SurgeryStepAddFelinidTail
-#  - type: SurgeryPartCondition
-#    part: Torso
-#  - type: SurgeryMarkingCondition
-#    markingCategory: Tail
-#    matchString: FelinidTail
-#    inverse: true
-
-#- type: entity
-#  parent: SurgeryBase
-#  id: SurgeryRemoveFelinidTail
-#  name: Remove cat tail
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: Surgery
-#    requirement: SurgeryOpenIncision
-#    steps:
-#    - SurgeryStepRemoveFelinidTail
-#  - type: SurgeryPartCondition
-#    part: Torso
-#  - type: SurgeryMarkingCondition
-#    markingCategory: Tail
-#    matchString: FelinidTail
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgery_steps.yml b/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgery_steps.yml
deleted file mode 100644
index 9ae15054b20..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgery_steps.yml
+++ /dev/null
@@ -1,630 +0,0 @@
-- type: entity
-  id: SurgeryStepBase
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepOpenIncisionScalpel
-  name: Cut with a scalpel
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Scalpel
-    add:
-    - type: IncisionOpen
-    duration: 2
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi
-    state: scalpel
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Bloodloss: 10
-    sleepModifier: 0.5
-  - type: SurgeryStepEmoteEffect
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepClampBleeders
-  name: Clamp the bleeders
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Hemostat
-    add:
-    - type: BleedersClamped
-    duration: 2
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi
-    state: hemostat
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Bloodloss: -5
-    sleepModifier: 2
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepRetractSkin
-  name: Retract the skin
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Retractor
-    add:
-    - type: SkinRetracted
-    duration: 2
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi
-    state: retractor
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepSawBones
-  name: Saw through bones
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: BoneSaw
-    add:
-    - type: RibcageSawed
-    duration: 4
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi
-    state: circular-saw
-  - type: SurgeryStepEmoteEffect
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepPriseOpenBones
-  name: Prise the bones open
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Retractor
-    add:
-    - type: RibcageOpen
-    duration: 2
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi
-    state: retractor
-
-#- type: entity
-#  parent: SurgeryStepBase
-#  id: SurgeryStepCutLarvaRoots
-#  name: Cut larva roots
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: SurgeryStep
-#    skill: 2
-#    tool:
-#    - type: Scalpel
-#  - type: SurgeryCutLarvaRootsStep
-#  - type: Sprite
-#    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
-#    state: scalpel
-#  - type: SurgeryOperatingTableCondition
-
-#- type: entity
-#  parent: SurgeryStepBase
-#  id: SurgeryStepRemoveLarva
-#  name: Remove larva
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: SurgeryStep
-#    skill: 2
-#    tool:
-#    - type: Hemostat
-#    bodyRemove:
-#    - type: VictimInfected
-#  - type: Sprite
-#    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
-#    state: hemostat
-#  - type: SurgeryOperatingTableCondition
-#  - type: SurgeryStepSpawnEffect
-#    entity: XenoEmbryo
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepCloseBones
-  name: Close bones
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Retractor
-    remove:
-    - type: RibcageOpen
-    duration: 2
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi
-    state: retractor
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepMendRibcage
-  name: Mend ribcage
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: BoneGel
-    remove:
-    - type: RibcageSawed
-    duration: 2
-  - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/bone_gel.rsi
-    state: bone-gel
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepCloseIncision
-  name: Close incision
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Cautery
-    remove:
-    # This surgery removes a bunch of components that might be leftover from other surgeries in unintended cases.
-    # Essentially a bit of a fallback for endusers :)
-    - type: SkinRetracted
-    - type: BleedersClamped
-    - type: IncisionOpen
-    - type: BodyPartReattached
-    - type: InternalBleedersClamped
-    duration: 2
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi
-    state: cautery
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Heat: -5
-    sleepModifier: 2
-  - type: SurgeryStepEmoteEffect
-
-# Feature Insertion
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepInsertFeature
-  name: Insert part
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: BodyPart
-    duration: 6
-  - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
-    state: insertion
-  - type: SurgeryAddPartStep
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepSealWounds
-  name: Seal wounds
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Cautery
-    remove:
-    - type: SkinRetracted
-    - type: BleedersClamped
-    - type: IncisionOpen
-    - type: InternalBleedersClamped
-    duration: 2
-  - type: SurgeryAffixPartStep
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi
-    state: cautery
-  - type: SurgeryStepEmoteEffect
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Heat: -5
-    sleepModifier: 2
-
-# Feature Removal
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepSawFeature
-  name: Saw through bones
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: BoneSaw
-    add:
-    - type: BodyPartSawed
-    duration: 4
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi
-    state: circular-saw
-  - type: SurgeryStepEmoteEffect
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepClampInternalBleeders
-  name: Clamp internal bleeders
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Hemostat
-    add:
-    - type: InternalBleedersClamped
-    duration: 2
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi
-    state: hemostat
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Bloodloss: -5
-    sleepModifier: 2
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepRemoveFeature
-  name: Amputate part
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: BoneSaw
-    remove:
-    # We remove these components to force people to go through all the steps again lol, otherwise you can just keep chopping.
-    - type: SkinRetracted
-    - type: BleedersClamped
-    - type: InternalBleedersClamped
-    - type: IncisionOpen
-    duration: 8
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi
-    state: circular-saw
-  - type: SurgeryRemovePartStep
-  - type: SurgeryStepEmoteEffect
-
-# Tend Wounds
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepCarefulIncisionScalpel
-  name: Make a careful incision
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Scalpel
-    add:
-    - type: IncisionOpen
-    duration: 3
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi
-    state: scalpel
-  - type: SurgeryStepEmoteEffect
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepRepairBruteTissue
-  name: Repair damaged tissue
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Tending
-    duration: 1
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi
-    state: hemostat
-  - type: SurgeryTendWoundsEffect
-    damage:
-      groups:
-        Brute: -5
-  - type: SurgeryRepeatableStep
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepRepairBurnTissue
-  name: Repair burnt tissue
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Tending
-    duration: 1
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi
-    state: hemostat
-  - type: SurgeryTendWoundsEffect
-    mainGroup: Burn
-    damage:
-      groups:
-        Burn: -5
-  - type: SurgeryRepeatableStep
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepSealTendWound
-  name: Seal the wound
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Cautery
-    remove:
-    - type: IncisionOpen
-    duration: 2
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi
-    state: cautery
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Heat: -5
-    sleepModifier: 2
-  - type: SurgeryStepEmoteEffect
-
-# Cavity Implanting
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepInsertItem
-  name: Insert item into cavity
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    duration: 4
-  - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
-    state: insertion
-  - type: SurgeryStepCavityEffect
-    action: Insert
-  - type: SurgeryStepEmoteEffect
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepRemoveItem
-  name: Remove item from cavity
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    duration: 4
-  - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
-    state: insertion
-  - type: SurgeryStepCavityEffect
-    action: Remove
-  - type: SurgeryStepEmoteEffect
-
-# Organ Manipulation
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepRemoveOrgan
-  name: Remove organ
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Tweezers
-    duration: 8
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi
-    state: hemostat
-  - type: SurgeryRemoveOrganStep
-  - type: SurgeryStepEmoteEffect
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepInsertOrgan
-  name: Add organ
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Organ
-    duration: 6
-  - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
-    state: insertion
-  - type: SurgeryAddOrganStep
-  - type: SurgeryStepEmoteEffect
-
-- type: entity
-  parent: SurgeryStepInsertOrgan
-  id: SurgeryStepInsertLungs
-  name: Add lungs
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Asphyxiation: -2147483648 # Literally the max 32 bit value, if your patient has gone higher than this, maybe it's time to restart the round.
-    sleepModifier: 1
-    isConsumable: true
-
-- type: entity
-  parent: SurgeryStepInsertOrgan
-  id: SurgeryStepInsertLiver
-  name: Add liver
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Poison: -2147483648 # Literally the max 32 bit value, if your patient has gone higher than this, maybe it's time to restart the round.
-    sleepModifier: 1
-    isConsumable: true
-
-- type: entity
-  parent: SurgeryStepInsertOrgan
-  id: SurgeryStepInsertEyes
-  name: Add eyes
-  categories: [ HideSpawnMenu ]
-
-- type: entity
-  parent: SurgeryStepInsertOrgan
-  id: SurgeryStepInsertHeart
-  name: Add heart
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgerySpecialDamageChangeEffect
-    damageType: Rot
-    isConsumable: true
-
-# Doesn't serve much of a purpose right now. Just here for completeness-sake.
-- type: entity
-  parent: SurgeryStepInsertOrgan
-  id: SurgeryStepInsertStomach
-  name: Add stomach
-  categories: [ HideSpawnMenu ]
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepSealOrganWound
-  name: Seal wounds
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Cautery
-    duration: 2
-  - type: SurgeryAffixOrganStep
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi
-    state: cautery
-  - type: SurgeryStepEmoteEffect
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Heat: -5
-    sleepModifier: 2
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepLobotomize
-  name: Lobotomize patient
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Drill
-    bodyAdd:
-    - type: OhioAccent
-    - type: RatvarianLanguage
-    - type: SlurredAccent
-    duration: 5
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi
-    state: drill
-  - type: SurgeryStepEmoteEffect
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Piercing: 10
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepMendBrainTissue
-  name: Mend brain tissue
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Hemostat
-    duration: 5
-    bodyRemove:
-    - type: OhioAccent
-    - type: RatvarianLanguage
-    - type: SlurredAccent
-  - type: Sprite
-    sprite: _CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi
-    state: drill
-  - type: SurgeryStepEmoteEffect
-
-# The lengths I go to just for a joke... I HATE HARDCODING AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-# Maybe I should modify species prototypes to include tails and ears properly...
-
-#- type: entity
-#  parent: SurgeryStepBase
-#  id: SurgeryStepAddFelinidEars
-#  name: Add cat ears
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: SurgeryStep
-#    tool:
-#    - type: Organ
-#  - type: SurgeryAddMarkingStep
-#    marking: FelinidEarsBasic
-#    markingCategory: HeadTop
-#    matchString: FelinidEars
-#    organ:
-#    - type: Ears
-#    accent:
-#    - type: OwOAccent
-#  - type: Sprite
-#    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
-#    state: insertion
-
-#- type: entity
-#  parent: SurgeryStepBase
-#  id: SurgeryStepAddFelinidTail
-#  name: Add cat tail
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: SurgeryStep
-#    tool:
-#    - type: Organ
-#  - type: SurgeryAddMarkingStep
-#    marking: FelinidTailBasic
-#    markingCategory: Tail
-#    matchString: FelinidTail
-#    organ:
-#    - type: Tail
-#  - type: Sprite
-#    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
-#    state: insertion
-
-#- type: entity
-#  parent: SurgeryStepBase
-#  id: SurgeryStepRemoveFelinidEars
-#  name: Remove cat ears
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: SurgeryStep
-#    tool:
-#    - type: Organ
-#  - type: SurgeryRemoveMarkingStep
-#    markingCategory: HeadTop
-#    matchString: FelinidEars
-#  - type: Sprite
-#    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
-#    state: insertion
-
-#- type: entity
-#  parent: SurgeryStepBase
-#  id: SurgeryStepRemoveFelinidTail
-#  name: Remove cat tail
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: SurgeryStep
-#    tool:
-#    - type: Organ
-#  - type: SurgeryRemoveMarkingStep
-#    markingCategory: Tail
-#    matchString: FelinidTail
-#  - type: Sprite
-#    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
-#    state: insertion
diff --git a/Resources/Prototypes/_CorvaxNext/Loadouts/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_CorvaxNext/Loadouts/Jobs/Medical/surgeon.yml
deleted file mode 100644
index 80609d78115..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Loadouts/Jobs/Medical/surgeon.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: loadoutEffectGroup
-  id: SeniorSurgeon
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobSurgeon
-      time: 187200 # 52 hrs
-
-- type: loadout
-  id: SurgeonScalpelLaser
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorSurgeon
-  storage:
-    back:
-    - ScalpelLaser
diff --git a/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml b/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml
index a2c7430d667..763b748ba16 100644
--- a/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml
@@ -30,27 +30,3 @@
   - BrigmedicOuterClothingCoat
   - BrigmedicOuterClothingLab
   - BrigmedicOuterClothingVest
-
-# Medical
-- type: loadoutGroup
-  id: SurgeonHead
-  name: loadout-group-surgeon-head
-  loadouts:
-  - BlueSurgeryCap
-  - GreenSurgeryCap
-  - PurpleSurgeryCap
-
-- type: loadoutGroup
-  id: SurgeonJumpsuit
-  name: loadout-group-surgeon-jumpsuit
-  loadouts:
-  - MedicalBlueScrubs
-  - MedicalGreenScrubs
-  - MedicalPurpleScrubs
-
-- type: loadoutGroup
-  id: SurgeonScalpel
-  name: loadout-group-surgeon-scalpel
-  minLimit: 0
-  loadouts:
-  - SurgeonScalpelLaser
diff --git a/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml
index 69556c9e3bb..0208f18542e 100644
--- a/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml
@@ -9,15 +9,3 @@
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool
-
-- type: roleLoadout
-  id: JobSurgeon
-  groups:
-  - Inventory # Corvax-Loadouts
-  - SurgeonHead
-  - SurgeonJumpsuit
-  - MedicalBackpack
-  - Survival
-  - Trinkets
-  - GroupSpeciesBreathTool
-  - SurgeonScalpel
diff --git a/Resources/Prototypes/_CorvaxNext/Mood/categories.yml b/Resources/Prototypes/_CorvaxNext/Mood/categories.yml
deleted file mode 100644
index 8c03338ca8b..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Mood/categories.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Alphabetically Ordered
-- type: moodCategory
-  id: Health
-
-- type: moodCategory
-  id: Hunger
-
-- type: moodCategory
-  id: Thirst
\ No newline at end of file
diff --git a/Resources/Prototypes/_CorvaxNext/Mood/genericNeeds.yml b/Resources/Prototypes/_CorvaxNext/Mood/genericNeeds.yml
deleted file mode 100644
index d0b24b7d7fe..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Mood/genericNeeds.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Hunger
-- type: moodEffect
-  id: HungerOverfed
-  moodChange: -10
-  category: "Hunger"
-
-- type: moodEffect
-  id: HungerOkay
-  moodChange: 7
-  category: "Hunger"
-
-- type: moodEffect
-  id: HungerPeckish
-  moodChange: -3
-  category: "Hunger"
-
-- type: moodEffect
-  id: HungerStarving
-  moodChange: -7
-  category: "Hunger"
-
-# Thirst
-- type: moodEffect
-  id: ThirstOverHydrated
-  moodChange: -3
-  category: "Thirst"
-
-- type: moodEffect
-  id: ThirstOkay
-  moodChange: 7
-  category: "Thirst"
-
-- type: moodEffect
-  id: ThirstThirsty
-  moodChange: -3
-  category: "Thirst"
-
-- type: moodEffect
-  id: ThirstParched
-  moodChange: -7
-  category: "Thirst"
-
-# Health
-- type: moodEffect
-  id: HealthNoDamage
-  moodChange: 0
-  hidden: true
-  category: "Health"
-
-- type: moodEffect
-  id: HealthLightDamage
-  moodChange: -3
-  category: "Health"
-
-- type: moodEffect
-  id: HealthSevereDamage
-  moodChange: -7
-  category: "Health"
-
-- type: moodEffect
-  id: HealthHeavyDamage
-  moodChange: -20
-  category: "Health"
diff --git a/Resources/Prototypes/_CorvaxNext/Mood/genericNegativeEffects.yml b/Resources/Prototypes/_CorvaxNext/Mood/genericNegativeEffects.yml
deleted file mode 100644
index 92faea75d10..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Mood/genericNegativeEffects.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-- type: moodEffect
-  id: Handcuffed
-  moodChange: -3
-
-- type: moodEffect
-  id: Suffocating
-  moodChange: -7
-  timeout: 6
-
-- type: moodEffect
-  id: OnFire
-  moodChange: -10
-  timeout: 600
-
-- type: moodEffect
-  id: Creampied
-  moodChange: -3
-
-- type: moodEffect
-  id: MobSlipped
-  moodChange: -3
-  timeout: 180
-
-- type: moodEffect
-  id: MobVomit
-  moodChange: -3
-  timeout: 480
-
-- type: moodEffect
-  id: MobLowPressure
-  moodChange: -7
-  timeout: 10
-
-- type: moodEffect
-  id: MobHighPressure
-  moodChange: -7
-  timeout: 10
-
-- type: moodEffect
-  id: TraitSaturnine
-  moodChange: -20
-
-- type: moodEffect
-  id: TraitFortitude
-  moodChange: -10
-
-- type: moodEffect
-  id: Dead
-  moodChange: -1000
-
-- type: moodEffect
-  id: SurgeryNoLeg
-  moodChange: -10
-
-- type: moodEffect
-  id: SurgeryNoHand
-  moodChange: -10
-
-- type: moodEffect
-  id: SurgeryNoTorso
-  moodChange: -15
-
-- type: moodEffect
-  id: SurgeryPain
-  moodChange: -30
-  timeout: 90
diff --git a/Resources/Prototypes/_CorvaxNext/Mood/genericPositiveEffects.yml b/Resources/Prototypes/_CorvaxNext/Mood/genericPositiveEffects.yml
deleted file mode 100644
index 9afca1f3cb7..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Mood/genericPositiveEffects.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-- type: moodEffect
-  id: BeingHugged
-  moodChange: 3
-  timeout: 90
-
-- type: moodEffect
-  id: WokeUp
-  moodChange: 5
-  timeout: 600
-
-- type: moodEffect
-  id: ArcadePlay
-  moodChange: 5
-  timeout: 480
-
-- type: moodEffect
-  id: GotBlessed
-  moodChange: 5
-  timeout: 480
-
-- type: moodEffect
-  id: PetAnimal
-  moodChange: 3
-  timeout: 300
-
-- type: moodEffect
-  id: SavedLife
-  moodChange: 7
-  timeout: 480
-
-- type: moodEffect
-  id: GotSavedLife
-  moodChange: 10
-  timeout: 480
-
-- type: moodEffect
-  id: TraitorFocused # Used for traitors to boost their goals completion.
-  moodChange: 7
-
-- type: moodEffect
-  id: NukeopsFocused # Used for nukies
-  moodChange: 10
-
-- type: moodEffect
-  id: RevolutionFocused # Used for revolution
-  moodChange: 7
-
-- type: moodEffect
-  id: CultFocused
-  moodChange: 10
-
-- type: moodEffect
-  id: TraitSanguine # Happi! Also used for Clown
-  moodChange: 15
diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/circuit_boards.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/circuit_boards.yml
index 99625467ed2..3765f8e689f 100644
--- a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/circuit_boards.yml
+++ b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/circuit_boards.yml
@@ -52,8 +52,3 @@
   parent: BaseCircuitboardRecipe
   id: NutimovCircuitBoard
   result: NutimovCircuitBoard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: MedicalBiofabMachineBoard
-  result: MedicalBiofabMachineBoard
diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/robotics.yml
deleted file mode 100644
index 980b4438f7b..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/robotics.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-- type: latheRecipe
-  id: BorgModuleSurgery
-  result: BorgModuleSurgery
-  category: Robotics
-  completetime: 3
-  materials:
-    Steel: 250
-    Glass: 250
-    Plastic: 250
-
-- type: latheRecipe
-  id: BorgModuleAdvancedSurgery
-  result: BorgModuleAdvancedSurgery
-  category: Robotics
-  completetime: 3
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 250
-    Gold: 50
-
-- type: latheRecipe
-  id: JawsOfLifeLeftArm
-  result: JawsOfLifeLeftArm
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: JawsOfLifeRightArm
-  result: JawsOfLifeRightArm
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: SpeedLeftLeg
-  result: SpeedLeftLeg
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: SpeedRightLeg
-  result: SpeedRightLeg
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: BasicCyberneticEyes
-  result: BasicCyberneticEyes
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/security.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/security.yml
deleted file mode 100644
index b6b39268adc..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/security.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: latheRecipe
-  id: SecurityCyberneticEyes
-  result: SecurityCyberneticEyes
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/surgery.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/surgery.yml
deleted file mode 100644
index 29549ed5051..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/surgery.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-- type: latheRecipe
-  id: BoneGel
-  result: BoneGel
-  completetime: 2
-  materials:
-    Plastic: 200
-    Plasma: 200
-
-- type: latheRecipe
-  id: MedicalCyberneticEyes
-  result: MedicalCyberneticEyes
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: EnergyScalpel
-  result: EnergyScalpel
-  completetime: 2
-  materials:
-    Steel: 600
-    Glass: 150
-    Gold: 150
-
-- type: latheRecipe
-  id: AdvancedRetractor
-  result: AdvancedRetractor
-  completetime: 2
-  materials:
-    Steel: 600
-    Glass: 150
-    Silver: 150
-
-- type: latheRecipe
-  id: EnergyCautery
-  result: EnergyCautery
-  completetime: 2
-  materials:
-    Steel: 600
-    Glass: 150
-    Plasma: 150
-
-- type: latheRecipe
-  id: OmnimedTool
-  result: OmnimedTool
-  completetime: 2
-  materials:
-    Steel: 1200
-    Glass: 300
-    Gold: 300
-    Silver: 300
-    Plasma: 300
-
-- type: latheRecipe
-  id: SynthHeart
-  result: BioSynthHeart
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthLungs
-  result: BioSynthLungs
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthLiver
-  result: BioSynthLiver
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthEyes
-  result: BioSynthEyes
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthLeftArm
-  result: BioSynthLeftArm
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthLeftHand
-  result: BioSynthLeftHand
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthRightArm
-  result: BioSynthRightArm
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthRightHand
-  result: BioSynthRightHand
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthLeftLeg
-  result: BioSynthLeftLeg
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthRightLeg
-  result: BioSynthRightLeg
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthLeftFoot
-  result: BioSynthLeftFoot
-  completetime: 30
-  materials:
-    Biomass: 10
-
-- type: latheRecipe
-  id: SynthRightFoot
-  result: BioSynthRightFoot
-  completetime: 30
-  materials:
-    Biomass: 10
diff --git a/Resources/Prototypes/_CorvaxNext/Research/civilianservices.yml b/Resources/Prototypes/_CorvaxNext/Research/civilianservices.yml
deleted file mode 100644
index f520d4cd89e..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Research/civilianservices.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Tier 2
-
-- type: technology
-  id: AdvancedTreatment
-  name: research-technology-advanced-treatment
-  icon:
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi
-    state: e-scalpel-on
-  discipline: CivilianServices
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - BorgModuleAdvancedTreatment
-  - BorgModuleDefibrillator
-  - EnergyScalpel
-  - EnergyCautery
-  - AdvancedRetractor
-  - BorgModuleAdvancedSurgery
-
-- type: technology
-  id: CyberneticEnhancements
-  name: research-technology-cybernetic-enhancements
-  icon:
-    sprite: _Shitmed/Mobs/Species/IPC/organs.rsi
-    state: eyes
-  discipline: CivilianServices
-  tier: 2
-  cost: 15000
-  recipeUnlocks:
-  - JawsOfLifeLeftArm
-  - JawsOfLifeRightArm
-  - SpeedLeftLeg
-  - SpeedRightLeg
-  - BasicCyberneticEyes
-  - SecurityCyberneticEyes
-  - MedicalCyberneticEyes
-
-# Tier 3
-
-- type: technology
-  id: HighEndSurgery
-  name: research-technology-high-end-surgery
-  icon:
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi
-    state: omnimed
-  discipline: CivilianServices
-  tier: 3
-  cost: 10000
-  recipeUnlocks:
-  - OmnimedTool
diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml
deleted file mode 100644
index 82758531951..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- type: job
-  id: Surgeon
-  name: job-name-surgeon
-  description: job-description-surgeon
-  playTimeTracker: JobSurgeon
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Medical
-      time: 54000 #15 hrs
-  startingGear: SurgeonGear
-  icon: "JobIconSurgeon"
-  supervisors: job-supervisors-cmo
-  access:
-  - Medical
-  - Maintenance
-  extendedAccess:
-  - Chemistry
-  special:
-  - !type:AddComponentSpecial
-    components:
-    - type: SurgerySpeedModifier
-      speedModifier: 2.5
-
-- type: startingGear
-  id: SurgeonGear
-  equipment:
-    ears: ClothingHeadsetMedical
-    belt: ClothingBeltSurgicalBoardFilled
-    shoes: ClothingShoesColorWhite
-    id: SurgeonPDA
-    mask: ClothingMaskSterile
-    gloves: ClothingHandsGlovesNitrile
diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml
index 50dc6ffff37..9fb092102d2 100644
--- a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml
@@ -25,10 +25,6 @@
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-    - type: SurgerySpeedModifier
-      speedModifier: 1.75
 
 - type: startingGear
   id: BrigmedicGear
diff --git a/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml b/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml
index 671a8d5ffc5..c1f40833b1f 100644
--- a/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml
@@ -1,5 +1,2 @@
 - type: playTimeTracker
   id: JobBrigmedic
-
-- type: playTimeTracker
-  id: JobSurgeon
diff --git a/Resources/Prototypes/_CorvaxNext/StatusIcon/job.yml b/Resources/Prototypes/_CorvaxNext/StatusIcon/job.yml
deleted file mode 100644
index be964ffa246..00000000000
--- a/Resources/Prototypes/_CorvaxNext/StatusIcon/job.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: jobIcon
-  parent: JobIcon
-  id: JobIconSurgeon
-  icon:
-    sprite: /Textures/_CorvaxNext/Interface/Misc/job_icons.rsi
-    state: Surgeon
-  jobName: job-name-surgeon
diff --git a/Resources/Prototypes/_CorvaxNext/Traits/categories.yml b/Resources/Prototypes/_CorvaxNext/Traits/categories.yml
deleted file mode 100644
index fd2f9aa6796..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Traits/categories.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: traitCategory
-  id: MoodTraits
-  name: trait-category-mood
-  maxTraitPoints: 1
diff --git a/Resources/Prototypes/_CorvaxNext/Traits/neutral.yml b/Resources/Prototypes/_CorvaxNext/Traits/neutral.yml
deleted file mode 100644
index bbc953e8336..00000000000
--- a/Resources/Prototypes/_CorvaxNext/Traits/neutral.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-# for mood haters
-- type: trait
-  id: Fortitude
-  name: trait-fortitude-name
-  description: trait-fortitude-desc
-  category: MoodTraits
-  cost: 1
-  components:
-  - type: MoodModifyTrait
-    moodId: TraitFortitude
-    goodMoodMultiplier: 0.5
-    badMoodMultiplier: 0.5
-
-- type: trait
-  id: Hypomania
-  name: trait-hypomania-name
-  description: trait-hypomania-desc
-  category: MoodTraits
-  cost: 1
-  components:
-  - type: MoodModifyTrait
-    moodId: TraitSanguine
-    badMoodMultiplier: 1.5 # Everything comes with a price.
-
-- type: trait
-  id: Depression
-  name: trait-depression-name
-  description: trait-depression-desc
-  category: MoodTraits
-  cost: 1
-  components:
-  - type: MoodModifyTrait
-    moodId: TraitSaturnine
diff --git a/Resources/Prototypes/_CorvaxNext/status_effects.yml b/Resources/Prototypes/_CorvaxNext/status_effects.yml
deleted file mode 100644
index 8d389525183..00000000000
--- a/Resources/Prototypes/_CorvaxNext/status_effects.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: statusEffect
-  id: BreathingImmunity
-  alwaysAllowed: true # Used by space animal lungs to work on anything
-
-- type: statusEffect
-  id: Brainrotted
diff --git a/Resources/Prototypes/_CorvaxNext/tags.yml b/Resources/Prototypes/_CorvaxNext/tags.yml
index 43238573627..fc84294804a 100644
--- a/Resources/Prototypes/_CorvaxNext/tags.yml
+++ b/Resources/Prototypes/_CorvaxNext/tags.yml
@@ -1,44 +1,2 @@
 - type: Tag
-  id: Organ
-
-- type: Tag
-  id: Liver
-
-- type: Tag
-  id: Heart
-
-- type: Tag
-  id: Eyes
-
-- type: Tag
-  id: Hemostat
-
-- type: Tag
-  id: Scalpel
-
-- type: Tag
-  id: EnergyScalpel
-
-- type: Tag
-  id: ScalpelLaser
-
-- type: Tag
-  id: Retractor
-
-- type: Tag
-  id: AdvancedRetractor
-
-- type: Tag
-  id: Cautery
-
-- type: Tag
-  id: EnergyCautery
-
-- type: Tag
-  id: Drill
-
-- type: Tag
-  id: SawElectric
-
-- type: Tag
-  id: ArtificialBluespaceCrystal
+  id: ArtificialBluespaceCrystal
\ No newline at end of file
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index 0d906f9a1a8..f6294be68e3 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -165,8 +165,6 @@
   - type: ShowHealthIcons
     damageContainers:
     - Biological
-  - type: SurgeryTarget # Corvax-Next-Surgery
-  - type: Sanitized # Corvax-Next-Surgery
 
   # Visual
   inventoryTemplateId: borgDutch
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index 7d8938c6f52..49e5ccc5794 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -36,7 +36,6 @@
 
 - type: statusEffect
   id: PressureImmunity
-  alwaysAllowed: true # Backmen: Used by space animal heart to work on anything
 
 - type: statusEffect
   id: Muted
diff --git a/Resources/ServerInfo/Corvax/Guidebook/Medical/OrganManipulation.xml b/Resources/ServerInfo/Corvax/Guidebook/Medical/OrganManipulation.xml
deleted file mode 100644
index 7c98372b1c6..00000000000
--- a/Resources/ServerInfo/Corvax/Guidebook/Medical/OrganManipulation.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<Document>
-# Манипуляция органами
-Хирургия позволяет вам заменять органы у пациентов на здоровые, что позволит вам лечить некоторые виды хронических болезней.
-
-## Анатомия
-Обычно в теле присутствуют следующие органы:
-
-<Box>
-<GuideEntityEmbed Entity="OrganHumanBrain" Caption="мозг (думалка)"/>
-<GuideEntityEmbed Entity="OrganHumanEyes" Caption="глаза"/>
-<GuideEntityEmbed Entity="OrganHumanHeart" Caption="сердце"/>
-</Box>
-<Box>
-<GuideEntityEmbed Entity="OrganHumanKidneys" Caption="почки"/>
-<GuideEntityEmbed Entity="OrganHumanLiver" Caption="печень"/>
-<GuideEntityEmbed Entity="OrganHumanLungs" Caption="лёгкие"/>
-<GuideEntityEmbed Entity="OrganHumanStomach" Caption="желудок"/>
-</Box>
-
-Некоторые виды имеют больше или меньше органов, например у Дион функции множества из этих органов объединены в одном универсальном, но в целом это общее представление о том, что вы можете встретить.
-Для удаления органа, вам необходимо провести соответствующую операцию Удалить Орган на части тела, в которой этот орган находится. С помощью этой процедуры вы сможете извлечь любой орган без вреда для пациента.
-
-Соответственно для трансплантации органа вам нужно использовать процедуру Добавления Органа на той части тела где он был раньше.
-
-## Что делает каждая из трансплантаций?
-- Трансплантация [color=#a4885c]мозга[/color] Позволит пациенту контролировать другое тело. Идеальная альтернатива клонированию если у вас есть свободное тело.
-- Трансплантация [color=#a4885c]печени[/color] излечит пациента от нанесённого ему урона ядами.
-- Трансплантация [color=#a4885c]лёгких[/color] излечит пациента от огромного количества урона удушьем.
-- Трансплантация [color=#a4885c]сердца[/color] излечит пациента от гниения и генетического урона.
-- Трансплантация [color=#a4885c]глаз[/color] позволит пациенту снова видеть, и излечит любой урон от глаз.
-
-## Где мне достать новые органы?
-
-Обычно когда к вам приходит пациент с целью трансплантации нового органа, им понадобится новый, поскольку старый будет либо отсутствовать, либо будет повреждён без возможности восстановления.
-Используйте для этого Медицинский Биофабрикатор, который производит био-синтетические органы для всех рас за биомассу.
-
-<Box>
-<GuideEntityEmbed Entity="MedicalBiofabricator" Caption="медицинский биофабрикатор"/>
-<GuideEntityEmbed Entity="MedicalBiofabMachineBoard" Caption="машинная плата"/>
-<GuideEntityEmbed Entity="MaterialBiomass" Caption="биомасса"/>
-</Box>
-
-Плата медицинского биофабрикатора есть у Главного Врача в его шкафчике.
-
-## Почему трансплантация органа
-## не произвела никакого эффекта?
-
-Тело вашего пациента отвергла орган, поскольку он в плохом состоянии, попробуйте использовать свежий орган от донора, либо же создайте новый при помощи Медицинского Биофабрикатора.
-
-</Document>
diff --git a/Resources/ServerInfo/Corvax/Guidebook/Medical/PartManipulation.xml b/Resources/ServerInfo/Corvax/Guidebook/Medical/PartManipulation.xml
deleted file mode 100644
index 284fa0fe230..00000000000
--- a/Resources/ServerInfo/Corvax/Guidebook/Medical/PartManipulation.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<Document>
-# Манипуляция частями тела
-С этим руководством вы сможете превращать феленидов в людей, либо же наоборот если вы особенно жестоки.
-
-## Анатомия
-Обычно тело имеет 10 основных частей. Среди них:
-
-<Box>
-<GuideEntityEmbed Entity="HeadHuman" Caption="голова"/>
-</Box>
-<Box>
-<GuideEntityEmbed Entity="RightHandHuman" Caption="правая рука"/>
-<GuideEntityEmbed Entity="RightArmHuman" Caption="левая ладонь"/>
-<GuideEntityEmbed Entity="TorsoHuman" Caption="туловище"/>
-<GuideEntityEmbed Entity="LeftArmHuman" Caption="левая рука"/>
-<GuideEntityEmbed Entity="LeftHandHuman" Caption="левая ладонь"/>
-</Box>
-<Box>
-<GuideEntityEmbed Entity="RightFootHuman" Caption="правая стопа"/>
-<GuideEntityEmbed Entity="RightLegHuman" Caption="правая нога"/>
-<GuideEntityEmbed Entity="LeftLegHuman" Caption="левая нога"/>
-<GuideEntityEmbed Entity="LeftFootHuman" Caption="левая стопа"/>
-</Box>
-
-Некоторые расы могут иметь больше или меньше частей тела, такие как хвосты, крылья или дополнительные конечностей, но в целом это приближённая модель того что вы увидите.
-Для удаления конечности, вам необходимо провести на ней хирурхическую операцию Удаления Конечности, которая удалит её без вреда для пациента.
-
-Однако если вы хотите присоединить конечность, вам необходимо провести операцию Присоединения Конечности на части тела к которой вы хотите её присоединить.
-Ладони прикреплены к рукам, стопы прикреплены к ногам, всё остальное прикреплено к туловищу.
-
-## Где мне взять больше частей тела?
-
-Обычно когда к вам приходит пациент с целью установки новой конечности, им понадобится новая, поскольку старая будет либо отсутствовать, либо повреждена без возможности восстановления.
-Для этого используйте Медицинский Биофабрикатор и немного биомассы. Затем произведите любую био-синтетическую часть тела, которая подойдёт любым расам.
-
-<Box>
-<GuideEntityEmbed Entity="MedicalBiofabricator" Caption="медицинский биофабрикатор"/>
-<GuideEntityEmbed Entity="MedicalBiofabMachineBoard" Caption="машинная плата"/>
-<GuideEntityEmbed Entity="MaterialBiomass" Caption="биомасса"/>
-</Box>
-
-Плата медицинского биофабрикатора есть у Главного Врача в его шкафчике.
-
-## Я присоединил часть тела к пациенту,
-## но почему она не работает?
-
-После прикрепления части тела к пациенту ей необходимо приживиться, для этого вам необходимо вылечить только что присоединённую часть тела.
-Неповреждённая часть потребует небольших затрат для этого, но с серьёзно повреждённой конечностью могут возникнуть трудности.
-Используйте хирургическую операцию для Лечения Ран, или же потратьте медикаменты для лечения нужной конечности.
-
-</Document>
diff --git a/Resources/ServerInfo/Corvax/Guidebook/Medical/Surgery.xml b/Resources/ServerInfo/Corvax/Guidebook/Medical/Surgery.xml
deleted file mode 100644
index c746bb64b03..00000000000
--- a/Resources/ServerInfo/Corvax/Guidebook/Medical/Surgery.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Document>
-# Хирургия
-Ваша еженедельная активность. С помощью проведения хирургических операций на пациентах вы можее лечить повреждения, добавлять новые части тела и органы, и так далее.
-
-## Основы
-Для начала хирургии пациент должен быть в положении лёжа, и в идеале без сознания.
-
-Если пациент всё ещё в сознании, он будет чувствовать огромную боль и могут получать гораздо более серьёзные травмы из-за болевого шока.
-
-<Box>
-<GuideEntityEmbed Entity="NitrousOxideTank" Caption="оксид азота"/>
-<GuideEntityEmbed Entity="ClothingMaskBreathMedical" Caption="любая маска для дыхания"/>
-</Box>
-
-Вам также потребуется надеть Перчатки и Маску для предотвращения попадания инфекции в тело пациента.
-
-<Box>
-<GuideEntityEmbed Entity="ClothingMaskSterile" Caption="любая маска"/>
-<GuideEntityEmbed Entity="ClothingHandsGlovesNitrile" Caption="любые перчатки"/>
-</Box>
-
-## Начало
-
-Для хирургического вмешательства, вам потребуется следующий набор инструментов.
-
-<Box>
-<GuideEntityEmbed Entity="Scalpel" Caption="скальпель"/>
-<GuideEntityEmbed Entity="Retractor" Caption="ретрактор"/>
-<GuideEntityEmbed Entity="Hemostat" Caption="гемостат"/>
-<GuideEntityEmbed Entity="Drill" Caption="дрель"/>
-</Box>
-<Box>
-<GuideEntityEmbed Entity="Saw" Caption="пила"/>
-<GuideEntityEmbed Entity="Cautery" Caption="прибор для прижигания"/>
-<GuideEntityEmbed Entity="BoneGel" Caption="костяной гель"/>
-</Box>
-
-Как только любой хирургический инструмент есть у вас в руке, провзаимодействуйте с телом пациента для начала операции. Вы можете выбрать части тела на которых хотите провести хирургию.
-
-</Document>
diff --git a/Resources/ServerInfo/Corvax/Guidebook/Medical/UtilitySurgeries.xml b/Resources/ServerInfo/Corvax/Guidebook/Medical/UtilitySurgeries.xml
deleted file mode 100644
index 16d26b4d224..00000000000
--- a/Resources/ServerInfo/Corvax/Guidebook/Medical/UtilitySurgeries.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Document>
-# Особые применения хирургии
-
-## Лечение ран
-
-Залечить Раны - это хирургическая операция, которая позволяет лечить Механический урон или урон от Ожогов без медикаментов.
-Для начала вам потребуется открыть разрез на теле пациента, а затем применять гемостат до тех пор, пока конечность не будет полностью восстановлена.
-Далее закройте разрез при помощи прибора для прижигания.
-
-<Box>
-<GuideEntityEmbed Entity="Scalpel" Caption="scalpel"/>
-<GuideEntityEmbed Entity="Hemostat" Caption="hemostat"/>
-<GuideEntityEmbed Entity="Cautery" Caption="cautery"/>
-</Box>
-
-Эта процедура работает тем лучше, чем больше у вашего пациента повреждений, особенно если он всё ещё жив. Это позволяет вам воскрешать пациентов
-с огромным количеством урона, например тупого Технического Ассистента который вошёл в горящую тритьеварку.
-
-## Имплантирование в полость
-
-Эта процедура позволяет вам имплантировать любой крошечный или маленький предмет в туловище пациента. Для начала вам необходимо открыть разрез, а затем открыть грудную клетку.
-Пациент не сможет никак взаимодействовать с имплантированным предметом, однако для этого могут быть особые способы использования, например это даёт возможность ещё эффективнее спрятать диск ядерной аунтетификации.
-
-</Document>
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/organs.rsi/lung-l.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/organs.rsi/lung-l.png
deleted file mode 100644
index 32aca484b9f..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/organs.rsi/lung-l.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/organs.rsi/lung-r.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/organs.rsi/lung-r.png
deleted file mode 100644
index 7e29649ccd8..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/organs.rsi/lung-r.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/organs.rsi/meta.json b/Resources/Textures/Backmen/Mobs/Species/Harpy/organs.rsi/meta.json
deleted file mode 100644
index e639085d8d0..00000000000
--- a/Resources/Textures/Backmen/Mobs/Species/Harpy/organs.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "lung-l"
-    },
-    {
-      "name": "lung-r"
-    }
-  ]
-}
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/full.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/full.png
deleted file mode 100644
index e358746ec8b..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/head_f.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/head_f.png
deleted file mode 100644
index b705d2d50e8..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/head_f.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/head_m.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/head_m.png
deleted file mode 100644
index e555d030bea..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_arm.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_arm.png
deleted file mode 100644
index 87c10adfa22..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_foot.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_foot.png
deleted file mode 100644
index a03b643ad62..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_hand.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_hand.png
deleted file mode 100644
index 2e0ec001ce2..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_leg.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_leg.png
deleted file mode 100644
index a70f92524b6..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/meta.json b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/meta.json
deleted file mode 100644
index 4073a762e89..00000000000
--- a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/meta.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf, Legs and lower torso parts made by @ps3moira, Full reference with parts made by @Still-Icarus",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "full"
-    },
-    {
-      "name": "head_f",
-      "directions": 4
-    },
-    {
-      "name": "head_m",
-      "directions": 4
-    },
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "l_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "l_leg",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_leg",
-      "directions": 4
-    },
-    {
-      "name": "torso_f",
-      "directions": 4
-    },
-    {
-      "name": "torso_m",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_arm.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_arm.png
deleted file mode 100644
index 6a47ac86071..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_foot.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_foot.png
deleted file mode 100644
index ef502c30f5c..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_hand.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_hand.png
deleted file mode 100644
index 2c16b27041c..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_leg.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_leg.png
deleted file mode 100644
index 9cdd3b85566..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/torso_f.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/torso_f.png
deleted file mode 100644
index 23dde35cd8e..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/torso_m.png b/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/torso_m.png
deleted file mode 100644
index 9a30fbfb574..00000000000
Binary files a/Resources/Textures/Backmen/Mobs/Species/Harpy/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/adv-surgery-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/adv-surgery-module.png
deleted file mode 100644
index df4b715569b..00000000000
Binary files a/Resources/Textures/Interface/Actions/actions_borg.rsi/adv-surgery-module.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index 0170e11812f..2ebb6eddcf5 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -61,12 +61,6 @@
         {
             "name":"treatment-module"
         },
-        {
-            "name":"surgery-module"
-        },
-        {
-            "name":"adv-surgery-module"
-        },
         {
             "name":"adv-diagnosis-module"
         },
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/surgery-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/surgery-module.png
deleted file mode 100644
index 4b333eba52a..00000000000
Binary files a/Resources/Textures/Interface/Actions/actions_borg.rsi/surgery-module.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/meta.json b/Resources/Textures/Interface/Alerts/mood.rsi/meta.json
deleted file mode 100644
index 0f6726a48d0..00000000000
--- a/Resources/Textures/Interface/Alerts/mood.rsi/meta.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from NSV13 at b6b1e2bf2cc60455851317d8e82cca8716d9dac1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "mood1"
-    },
-    {
-      "name": "mood2"
-    },
-    {
-      "name": "mood3"
-    },
-    {
-      "name": "mood4"
-    },
-    {
-      "name": "mood5"
-    },
-    {
-      "name": "mood6"
-    },
-    {
-      "name": "mood7"
-    },
-    {
-      "name": "mood8"
-    },
-    {
-      "name": "mood9"
-    },
-    {
-      "name": "mood_happiness_bad"
-    },
-    {
-      "name": "mood_happiness_good"
-    },
-    {
-      "name": "mood_insane",
-      "delays": [
-        [
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood1.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood1.png
deleted file mode 100644
index ae1e1386db4..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood2.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood2.png
deleted file mode 100644
index 41be928f025..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood3.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood3.png
deleted file mode 100644
index 179991e1984..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood4.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood4.png
deleted file mode 100644
index 4ea7d701171..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood5.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood5.png
deleted file mode 100644
index c4c3370f625..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood6.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood6.png
deleted file mode 100644
index 388483e1438..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood7.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood7.png
deleted file mode 100644
index b4f944d045e..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood8.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood8.png
deleted file mode 100644
index f12f71b7ffa..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood9.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood9.png
deleted file mode 100644
index e65c6501495..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood9.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_bad.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_bad.png
deleted file mode 100644
index 4ed8f4d68f8..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_bad.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_good.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_good.png
deleted file mode 100644
index eb9943a3015..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_good.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood_insane.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood_insane.png
deleted file mode 100644
index b2407bbdad8..00000000000
Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood_insane.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Ashen/target_doll.png b/Resources/Textures/Interface/Ashen/target_doll.png
deleted file mode 100644
index e8eb2f52717..00000000000
Binary files a/Resources/Textures/Interface/Ashen/target_doll.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Clockwork/target_doll.png b/Resources/Textures/Interface/Clockwork/target_doll.png
deleted file mode 100644
index 8426d42299a..00000000000
Binary files a/Resources/Textures/Interface/Clockwork/target_doll.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Default/target_doll.png b/Resources/Textures/Interface/Default/target_doll.png
deleted file mode 100644
index e8eb2f52717..00000000000
Binary files a/Resources/Textures/Interface/Default/target_doll.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Minimalist/target_doll.png b/Resources/Textures/Interface/Minimalist/target_doll.png
deleted file mode 100644
index e8eb2f52717..00000000000
Binary files a/Resources/Textures/Interface/Minimalist/target_doll.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Plasmafire/target_doll.png b/Resources/Textures/Interface/Plasmafire/target_doll.png
deleted file mode 100644
index 57262d67028..00000000000
Binary files a/Resources/Textures/Interface/Plasmafire/target_doll.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Retro/target_doll.png b/Resources/Textures/Interface/Retro/target_doll.png
deleted file mode 100644
index a147539c3ae..00000000000
Binary files a/Resources/Textures/Interface/Retro/target_doll.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Slimecore/target_doll.png b/Resources/Textures/Interface/Slimecore/target_doll.png
deleted file mode 100644
index 0706eb661b5..00000000000
Binary files a/Resources/Textures/Interface/Slimecore/target_doll.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/eyes.png b/Resources/Textures/Interface/Targeting/Doll/eyes.png
deleted file mode 100644
index 8cf9fa9e191..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/eyes.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/eyes_hover.png b/Resources/Textures/Interface/Targeting/Doll/eyes_hover.png
deleted file mode 100644
index 72a30d73b84..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/eyes_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/groin.png b/Resources/Textures/Interface/Targeting/Doll/groin.png
deleted file mode 100644
index 2c1a3debdaa..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/groin.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/groin_hover.png b/Resources/Textures/Interface/Targeting/Doll/groin_hover.png
deleted file mode 100644
index 313b6a1124c..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/groin_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/head.png b/Resources/Textures/Interface/Targeting/Doll/head.png
deleted file mode 100644
index 9c645d2353c..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/head.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/head_hover.png b/Resources/Textures/Interface/Targeting/Doll/head_hover.png
deleted file mode 100644
index 3c03f2aebe1..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/head_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftarm.png b/Resources/Textures/Interface/Targeting/Doll/leftarm.png
deleted file mode 100644
index 32661f5c6a1..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/leftarm.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftarm_hover.png b/Resources/Textures/Interface/Targeting/Doll/leftarm_hover.png
deleted file mode 100644
index a9b2c960cec..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/leftarm_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftfoot.png b/Resources/Textures/Interface/Targeting/Doll/leftfoot.png
deleted file mode 100644
index 07da8e67b75..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/leftfoot.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftfoot_hover.png b/Resources/Textures/Interface/Targeting/Doll/leftfoot_hover.png
deleted file mode 100644
index 2c9f9e38df4..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/leftfoot_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/lefthand.png b/Resources/Textures/Interface/Targeting/Doll/lefthand.png
deleted file mode 100644
index a0251efb2c6..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/lefthand.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/lefthand_hover.png b/Resources/Textures/Interface/Targeting/Doll/lefthand_hover.png
deleted file mode 100644
index 3ff52eae555..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/lefthand_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftleg.png b/Resources/Textures/Interface/Targeting/Doll/leftleg.png
deleted file mode 100644
index 99dc24ce62e..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/leftleg.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftleg_hover.png b/Resources/Textures/Interface/Targeting/Doll/leftleg_hover.png
deleted file mode 100644
index f2c2979e418..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/leftleg_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/mouth.png b/Resources/Textures/Interface/Targeting/Doll/mouth.png
deleted file mode 100644
index 202f411874e..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/mouth.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/mouth_hover.png b/Resources/Textures/Interface/Targeting/Doll/mouth_hover.png
deleted file mode 100644
index a5014f42ca3..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/mouth_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightarm.png b/Resources/Textures/Interface/Targeting/Doll/rightarm.png
deleted file mode 100644
index 223afaacad0..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/rightarm.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightarm_hover.png b/Resources/Textures/Interface/Targeting/Doll/rightarm_hover.png
deleted file mode 100644
index 7121c80830d..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/rightarm_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightfoot.png b/Resources/Textures/Interface/Targeting/Doll/rightfoot.png
deleted file mode 100644
index d1c687c6815..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/rightfoot.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightfoot_hover.png b/Resources/Textures/Interface/Targeting/Doll/rightfoot_hover.png
deleted file mode 100644
index 60897a28805..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/rightfoot_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/righthand.png b/Resources/Textures/Interface/Targeting/Doll/righthand.png
deleted file mode 100644
index e71f8de80ed..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/righthand.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/righthand_hover.png b/Resources/Textures/Interface/Targeting/Doll/righthand_hover.png
deleted file mode 100644
index d51910da173..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/righthand_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightleg.png b/Resources/Textures/Interface/Targeting/Doll/rightleg.png
deleted file mode 100644
index 5f7b6836105..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/rightleg.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightleg_hover.png b/Resources/Textures/Interface/Targeting/Doll/rightleg_hover.png
deleted file mode 100644
index b0936de0a09..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/rightleg_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/torso.png b/Resources/Textures/Interface/Targeting/Doll/torso.png
deleted file mode 100644
index 44297c96c32..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/torso.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/torso_hover.png b/Resources/Textures/Interface/Targeting/Doll/torso_hover.png
deleted file mode 100644
index 70f5e5969c0..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Doll/torso_hover.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_0.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_0.png
deleted file mode 100644
index 2e46e3a8cf1..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_1.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_1.png
deleted file mode 100644
index 7df0059c12c..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_2.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_2.png
deleted file mode 100644
index 8a6e3add67f..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_3.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_3.png
deleted file mode 100644
index 6d7966fc141..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_4.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_4.png
deleted file mode 100644
index cc36cf23ca4..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_5.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_5.png
deleted file mode 100644
index 3f260e12259..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_6.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_6.png
deleted file mode 100644
index 0bb632ba388..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_7.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_7.png
deleted file mode 100644
index 0bb632ba388..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_8.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_8.png
deleted file mode 100644
index c23961f396b..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/groin.rsi/meta.json
deleted file mode 100644
index 6acd4a2c24b..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/groin.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "groin_0"
-        },
-        {
-        "name": "groin_1"
-        },
-        {
-        "name": "groin_2"
-        },
-        {
-        "name": "groin_3"
-        },
-        {
-        "name": "groin_4"
-        },
-        {
-        "name": "groin_5"
-        },
-        {
-        "name": "groin_6"
-        },
-        {
-        "name": "groin_7"
-        },
-        {
-        "name": "groin_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_0.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_0.png
deleted file mode 100644
index f547b0bc961..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_1.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_1.png
deleted file mode 100644
index 0ba1a77dfd9..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_2.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_2.png
deleted file mode 100644
index 1cb55b4fe97..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_3.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_3.png
deleted file mode 100644
index d797b40a161..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_4.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_4.png
deleted file mode 100644
index fbc1678ce5d..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_5.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_5.png
deleted file mode 100644
index f6caf62d405..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_6.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_6.png
deleted file mode 100644
index 74b58c642bb..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_7.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_7.png
deleted file mode 100644
index 74b58c642bb..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_8.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_8.png
deleted file mode 100644
index 4d024c61f7f..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/head.rsi/meta.json
deleted file mode 100644
index 2c34f86c28e..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/head.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "head_0"
-        },
-        {
-        "name": "head_1"
-        },
-        {
-        "name": "head_2"
-        },
-        {
-        "name": "head_3"
-        },
-        {
-        "name": "head_4"
-        },
-        {
-        "name": "head_5"
-        },
-        {
-        "name": "head_6"
-        },
-        {
-        "name": "head_7"
-        },
-        {
-        "name": "head_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_0.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_0.png
deleted file mode 100644
index 22c7982489b..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_1.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_1.png
deleted file mode 100644
index cd3b5d4c1c8..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_2.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_2.png
deleted file mode 100644
index e4db1961679..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_3.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_3.png
deleted file mode 100644
index d6a204a18a9..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_4.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_4.png
deleted file mode 100644
index 2c9e81508b3..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_5.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_5.png
deleted file mode 100644
index 930a7b52ed1..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_6.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_6.png
deleted file mode 100644
index efc7380c270..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png
deleted file mode 100644
index efc7380c270..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png
deleted file mode 100644
index a00a6b1822e..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/meta.json
deleted file mode 100644
index dab3ed611da..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "leftarm_0"
-        },
-        {
-        "name": "leftarm_1"
-        },
-        {
-        "name": "leftarm_2"
-        },
-        {
-        "name": "leftarm_3"
-        },
-        {
-        "name": "leftarm_4"
-        },
-        {
-        "name": "leftarm_5"
-        },
-        {
-        "name": "leftarm_6"
-        },
-        {
-        "name": "leftarm_7"
-        },
-        {
-        "name": "leftarm_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_0.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_0.png
deleted file mode 100644
index af6e8eb45e5..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_1.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_1.png
deleted file mode 100644
index b8e10c8c48c..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_2.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_2.png
deleted file mode 100644
index 31feb63b7bc..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_3.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_3.png
deleted file mode 100644
index 274855e4194..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_4.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_4.png
deleted file mode 100644
index b3e5dfefa16..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_5.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_5.png
deleted file mode 100644
index b4af7c1c036..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_6.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_6.png
deleted file mode 100644
index 9822dfba4cb..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_7.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_7.png
deleted file mode 100644
index 9822dfba4cb..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_8.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_8.png
deleted file mode 100644
index bdaec2557cb..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/meta.json
deleted file mode 100644
index 9396f537f80..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "leftfoot_0"
-        },
-        {
-        "name": "leftfoot_1"
-        },
-        {
-        "name": "leftfoot_2"
-        },
-        {
-        "name": "leftfoot_3"
-        },
-        {
-        "name": "leftfoot_4"
-        },
-        {
-        "name": "leftfoot_5"
-        },
-        {
-        "name": "leftfoot_6"
-        },
-        {
-        "name": "leftfoot_7"
-        },
-        {
-        "name": "leftfoot_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_0.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_0.png
deleted file mode 100644
index f56984a54eb..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_1.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_1.png
deleted file mode 100644
index e5a7aea1b40..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_2.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_2.png
deleted file mode 100644
index 43c72f0b210..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_3.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_3.png
deleted file mode 100644
index 3114a1995cd..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_4.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_4.png
deleted file mode 100644
index 83c4daefabf..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_5.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_5.png
deleted file mode 100644
index 06946c97c74..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_6.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_6.png
deleted file mode 100644
index 7d2ed496616..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_7.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_7.png
deleted file mode 100644
index 7d2ed496616..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_8.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_8.png
deleted file mode 100644
index 2b33680d438..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/meta.json
deleted file mode 100644
index f7d5a595258..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "lefthand_0"
-        },
-        {
-        "name": "lefthand_1"
-        },
-        {
-        "name": "lefthand_2"
-        },
-        {
-        "name": "lefthand_3"
-        },
-        {
-        "name": "lefthand_4"
-        },
-        {
-        "name": "lefthand_5"
-        },
-        {
-        "name": "lefthand_6"
-        },
-        {
-        "name": "lefthand_7"
-        },
-        {
-        "name": "lefthand_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_0.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_0.png
deleted file mode 100644
index 9f8193be960..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_1.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_1.png
deleted file mode 100644
index ab0c3e410da..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_2.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_2.png
deleted file mode 100644
index 6390bbf7ab6..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_3.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_3.png
deleted file mode 100644
index 9159aebd456..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_4.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_4.png
deleted file mode 100644
index 9dcd84fffdf..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_5.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_5.png
deleted file mode 100644
index 4e302cda649..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_6.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_6.png
deleted file mode 100644
index d36a43c441d..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png
deleted file mode 100644
index d36a43c441d..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png
deleted file mode 100644
index 75bd581d69b..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/meta.json
deleted file mode 100644
index 887c60f37cc..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "leftleg_0"
-        },
-        {
-        "name": "leftleg_1"
-        },
-        {
-        "name": "leftleg_2"
-        },
-        {
-        "name": "leftleg_3"
-        },
-        {
-        "name": "leftleg_4"
-        },
-        {
-        "name": "leftleg_5"
-        },
-        {
-        "name": "leftleg_6"
-        },
-        {
-        "name": "leftleg_7"
-        },
-        {
-        "name": "leftleg_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/meta.json
deleted file mode 100644
index eb19b5d4c47..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "rightarm_0"
-        },
-        {
-        "name": "rightarm_1"
-        },
-        {
-        "name": "rightarm_2"
-        },
-        {
-        "name": "rightarm_3"
-        },
-        {
-        "name": "rightarm_4"
-        },
-        {
-        "name": "rightarm_5"
-        },
-        {
-        "name": "rightarm_6"
-        },
-        {
-        "name": "rightarm_7"
-        },
-        {
-        "name": "rightarm_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png
deleted file mode 100644
index 44c8aca6329..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_1.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_1.png
deleted file mode 100644
index 035e0ae12e9..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_2.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_2.png
deleted file mode 100644
index f6db2e12a9b..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_3.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_3.png
deleted file mode 100644
index cd974fdeea6..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_4.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_4.png
deleted file mode 100644
index 0a5977cfaf8..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_5.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_5.png
deleted file mode 100644
index 1eb5f0eadd4..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_6.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_6.png
deleted file mode 100644
index 35eec2905a5..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png
deleted file mode 100644
index 35eec2905a5..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png
deleted file mode 100644
index 9f894b1bfb3..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/meta.json
deleted file mode 100644
index ce1b1f37e7b..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "rightfoot_0"
-        },
-        {
-        "name": "rightfoot_1"
-        },
-        {
-        "name": "rightfoot_2"
-        },
-        {
-        "name": "rightfoot_3"
-        },
-        {
-        "name": "rightfoot_4"
-        },
-        {
-        "name": "rightfoot_5"
-        },
-        {
-        "name": "rightfoot_6"
-        },
-        {
-        "name": "rightfoot_7"
-        },
-        {
-        "name": "rightfoot_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_0.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_0.png
deleted file mode 100644
index 573e32ca106..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_1.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_1.png
deleted file mode 100644
index 967639b3fd1..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_2.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_2.png
deleted file mode 100644
index bff7d8016d0..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_3.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_3.png
deleted file mode 100644
index d74824df983..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_4.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_4.png
deleted file mode 100644
index 50f6abc2c34..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_5.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_5.png
deleted file mode 100644
index c824c98dfc2..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_6.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_6.png
deleted file mode 100644
index ebc654d70e9..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_7.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_7.png
deleted file mode 100644
index ebc654d70e9..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_8.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_8.png
deleted file mode 100644
index 06ab1d2519d..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/meta.json
deleted file mode 100644
index 61c5b77862c..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "righthand_0"
-        },
-        {
-        "name": "righthand_1"
-        },
-        {
-        "name": "righthand_2"
-        },
-        {
-        "name": "righthand_3"
-        },
-        {
-        "name": "righthand_4"
-        },
-        {
-        "name": "righthand_5"
-        },
-        {
-        "name": "righthand_6"
-        },
-        {
-        "name": "righthand_7"
-        },
-        {
-        "name": "righthand_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_0.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_0.png
deleted file mode 100644
index a69056bb651..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_1.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_1.png
deleted file mode 100644
index e14168b2e7d..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_2.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_2.png
deleted file mode 100644
index b12b15e883b..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_3.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_3.png
deleted file mode 100644
index a030aa0980c..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_4.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_4.png
deleted file mode 100644
index 4afd3e7f531..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_5.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_5.png
deleted file mode 100644
index 5062dafc206..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_6.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_6.png
deleted file mode 100644
index 87e8f18ef82..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_7.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_7.png
deleted file mode 100644
index 87e8f18ef82..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_8.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_8.png
deleted file mode 100644
index 797e0683e8b..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/meta.json
deleted file mode 100644
index 7dded85e45f..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "rightleg_0"
-        },
-        {
-        "name": "rightleg_1"
-        },
-        {
-        "name": "rightleg_2"
-        },
-        {
-        "name": "rightleg_3"
-        },
-        {
-        "name": "rightleg_4"
-        },
-        {
-        "name": "rightleg_5"
-        },
-        {
-        "name": "rightleg_6"
-        },
-        {
-        "name": "rightleg_7"
-        },
-        {
-        "name": "rightleg_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png
deleted file mode 100644
index f773330b026..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_1.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_1.png
deleted file mode 100644
index 786b0777c38..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_2.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_2.png
deleted file mode 100644
index 2ac7cbafa6d..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_3.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_3.png
deleted file mode 100644
index 2f9690690d7..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_4.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_4.png
deleted file mode 100644
index ec62ccb0627..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_5.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_5.png
deleted file mode 100644
index d30e124e64d..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_6.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_6.png
deleted file mode 100644
index 9c4ee1f9038..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png
deleted file mode 100644
index 9c4ee1f9038..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png
deleted file mode 100644
index 70ccb309add..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/torso.rsi/meta.json
deleted file mode 100644
index 7baeebd0801..00000000000
--- a/Resources/Textures/Interface/Targeting/Status/torso.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-        "name": "torso_0"
-        },
-        {
-        "name": "torso_1"
-        },
-        {
-        "name": "torso_2"
-        },
-        {
-        "name": "torso_3"
-        },
-        {
-        "name": "torso_4"
-        },
-        {
-        "name": "torso_5"
-        },
-        {
-        "name": "torso_6"
-        },
-        {
-        "name": "torso_7"
-        },
-        {
-        "name": "torso_8"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_0.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_0.png
deleted file mode 100644
index b20ce001ba6..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_0.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_1.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_1.png
deleted file mode 100644
index 591b6a5bab5..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_2.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_2.png
deleted file mode 100644
index 71f09fc7f6b..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_3.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_3.png
deleted file mode 100644
index fa9f954321c..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_4.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_4.png
deleted file mode 100644
index ada865a05fe..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_5.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_5.png
deleted file mode 100644
index 8f3a6ad7d0e..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_6.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_6.png
deleted file mode 100644
index c289a454bdb..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_7.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_7.png
deleted file mode 100644
index c289a454bdb..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_8.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_8.png
deleted file mode 100644
index eefec17cf60..00000000000
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_8.png and /dev/null differ
diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json
index 17bff5a9e55..bca3be1df84 100644
--- a/Resources/Textures/Markers/jobs.rsi/meta.json
+++ b/Resources/Textures/Markers/jobs.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github), surgeon by Ko4erga",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)",
   "size": {
     "x": 32,
     "y": 32
@@ -190,9 +190,6 @@
     {
       "name": "seniorofficer"
     },
-    {
-      "name": "surgeon"
-    },
     {
       "name": "technicalassistant"
     },
diff --git a/Resources/Textures/Markers/jobs.rsi/surgeon.png b/Resources/Textures/Markers/jobs.rsi/surgeon.png
deleted file mode 100644
index 7f8becb4870..00000000000
Binary files a/Resources/Textures/Markers/jobs.rsi/surgeon.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/eyes.png b/Resources/Textures/Mobs/Animals/kobold.rsi/eyes.png
deleted file mode 100644
index 626bd2fa1ea..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/eyes.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/full.png b/Resources/Textures/Mobs/Animals/kobold.rsi/full.png
deleted file mode 100644
index 25006b92124..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/head_f.png b/Resources/Textures/Mobs/Animals/kobold.rsi/head_f.png
deleted file mode 100644
index 6b6102a5b50..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/head_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/head_m.png b/Resources/Textures/Mobs/Animals/kobold.rsi/head_m.png
deleted file mode 100644
index 6b6102a5b50..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/innerline.png b/Resources/Textures/Mobs/Animals/kobold.rsi/innerline.png
deleted file mode 100644
index 4be7d2591e1..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/innerline.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png b/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png
index 4a6ad59a830..4be7d2591e1 100644
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png and b/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/l_arm.png b/Resources/Textures/Mobs/Animals/kobold.rsi/l_arm.png
deleted file mode 100644
index 2c4d11a4911..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/l_foot.png b/Resources/Textures/Mobs/Animals/kobold.rsi/l_foot.png
deleted file mode 100644
index bf8f9af0b08..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/l_hand.png b/Resources/Textures/Mobs/Animals/kobold.rsi/l_hand.png
deleted file mode 100644
index 3c75cb89827..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/l_leg.png b/Resources/Textures/Mobs/Animals/kobold.rsi/l_leg.png
deleted file mode 100644
index 6b6cd11eff0..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json b/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json
index 769f96a914e..05e21930b6b 100644
--- a/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json
@@ -5,75 +5,12 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser, modified by Bhijn and Myr, parts splitted up by Roudenn (GitHub)",
+  "copyright": "Drawn by Ubaser, modified by Bhijn and Myr",
   "states": [
     {
       "name": "kobold",
       "directions": 4
     },
-    {
-      "name": "full"
-    },
-    {
-      "name": "head_f",
-      "directions": 4
-    },
-    {
-      "name": "head_m",
-      "directions": 4
-    },
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "l_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "l_leg",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_leg",
-      "directions": 4
-    },
-    {
-      "name": "torso_f",
-      "directions": 4
-    },
-    {
-      "name": "torso_m",
-      "directions": 4
-    },
-    {
-      "name": "tail",
-      "directions": 4
-    },
-    {
-      "name": "eyes",
-      "directions": 4
-    },
-    {
-      "name": "innerline",
-      "directions": 4
-    },
     {
       "name": "outline",
       "directions": 4
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/r_arm.png b/Resources/Textures/Mobs/Animals/kobold.rsi/r_arm.png
deleted file mode 100644
index bfbfe25fb75..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/r_foot.png b/Resources/Textures/Mobs/Animals/kobold.rsi/r_foot.png
deleted file mode 100644
index bd9f3e77c9d..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/r_hand.png b/Resources/Textures/Mobs/Animals/kobold.rsi/r_hand.png
deleted file mode 100644
index bd3bf53a29e..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/r_leg.png b/Resources/Textures/Mobs/Animals/kobold.rsi/r_leg.png
deleted file mode 100644
index e99fca61c95..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/tail.png b/Resources/Textures/Mobs/Animals/kobold.rsi/tail.png
deleted file mode 100644
index 9d1b337ab76..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/tail.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/torso_f.png b/Resources/Textures/Mobs/Animals/kobold.rsi/torso_f.png
deleted file mode 100644
index 192d2b9849e..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/torso_m.png b/Resources/Textures/Mobs/Animals/kobold.rsi/torso_m.png
deleted file mode 100644
index 192d2b9849e..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/eyes.png b/Resources/Textures/Mobs/Animals/monkey.rsi/eyes.png
deleted file mode 100644
index 573a605e91a..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/eyes.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/full.png b/Resources/Textures/Mobs/Animals/monkey.rsi/full.png
deleted file mode 100644
index c36e9abf8b8..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/head_f.png b/Resources/Textures/Mobs/Animals/monkey.rsi/head_f.png
deleted file mode 100644
index e84d4fbbb5f..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/head_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/head_m.png b/Resources/Textures/Mobs/Animals/monkey.rsi/head_m.png
deleted file mode 100644
index e84d4fbbb5f..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/l_arm.png b/Resources/Textures/Mobs/Animals/monkey.rsi/l_arm.png
deleted file mode 100644
index b72718d59a5..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/l_foot.png b/Resources/Textures/Mobs/Animals/monkey.rsi/l_foot.png
deleted file mode 100644
index 9856dd6faef..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/l_hand.png b/Resources/Textures/Mobs/Animals/monkey.rsi/l_hand.png
deleted file mode 100644
index 5ac8ce3e608..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/l_leg.png b/Resources/Textures/Mobs/Animals/monkey.rsi/l_leg.png
deleted file mode 100644
index 7907f130f4c..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json b/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
index d22ab1556c9..b62cac749ad 100644
--- a/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
@@ -1,74 +1,15 @@
 {
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , edited by Alekshhh, parts splitted up by Roudenn (GitHub)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "full"
-        },
-        {
-            "name": "monkey",
-            "directions": 4
-        },
-        {
-            "name": "head_f",
-            "directions": 4
-        },
-        {
-            "name": "head_m",
-            "directions": 4
-        },
-        {
-            "name": "l_arm",
-            "directions": 4
-        },
-        {
-            "name": "l_foot",
-            "directions": 4
-        },
-        {
-            "name": "l_hand",
-            "directions": 4
-        },
-        {
-            "name": "l_leg",
-            "directions": 4
-        },
-        {
-            "name": "r_arm",
-            "directions": 4
-        },
-        {
-            "name": "r_foot",
-            "directions": 4
-        },
-        {
-            "name": "r_hand",
-            "directions": 4
-        },
-        {
-            "name": "r_leg",
-            "directions": 4
-        },
-        {
-            "name": "torso_f",
-            "directions": 4
-        },
-        {
-            "name": "torso_m",
-            "directions": 4
-        },
-        {
-            "name": "tail",
-            "directions": 4
-        },
-        {
-            "name": "eyes",
-            "directions": 4
-        }
-    ]
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , edited by Alekshhh",
+  "states": [
+    {
+      "name": "monkey",
+      "directions": 4
+    }
+  ]
 }
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/r_arm.png b/Resources/Textures/Mobs/Animals/monkey.rsi/r_arm.png
deleted file mode 100644
index db4a7b639a9..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/r_foot.png b/Resources/Textures/Mobs/Animals/monkey.rsi/r_foot.png
deleted file mode 100644
index 8c144840497..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/r_hand.png b/Resources/Textures/Mobs/Animals/monkey.rsi/r_hand.png
deleted file mode 100644
index f4e27204944..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/r_leg.png b/Resources/Textures/Mobs/Animals/monkey.rsi/r_leg.png
deleted file mode 100644
index c470114e15d..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/tail.png b/Resources/Textures/Mobs/Animals/monkey.rsi/tail.png
deleted file mode 100644
index ddf07fb0ae8..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/tail.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/torso_f.png b/Resources/Textures/Mobs/Animals/monkey.rsi/torso_f.png
deleted file mode 100644
index aa3c5ce5487..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/torso_m.png b/Resources/Textures/Mobs/Animals/monkey.rsi/torso_m.png
deleted file mode 100644
index aa3c5ce5487..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
index ba292e8165b..f77f8c0e711 100644
--- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
@@ -226,9 +226,6 @@
     {
       "name": "pda-seniorofficer"
     },
-    {
-      "name": "pda-surgeon"
-    },
     {
       "name": "equipped-IDCARD",
       "directions": 4
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-surgeon.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-surgeon.png
deleted file mode 100644
index 0af3dbfc224..00000000000
Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-surgeon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idsurgeon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsurgeon.png
deleted file mode 100644
index 56bdc33dc53..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idsurgeon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index defd6dd22ad..80e62c119d6 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -227,14 +227,11 @@
       "name": "idseniorphysician"
     },
     {
-      "name": "idseniorofficer"
+        "name": "idseniorofficer"
     },
     {
       "name": "idpilot"
     },
-    {
-      "name": "idsurgeon"
-    },
     {
       "name": "gold-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel.png
deleted file mode 100644
index f66bf6cdf9e..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_0.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_0.png
deleted file mode 100644
index 4399c73304b..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_25.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_25.png
deleted file mode 100644
index 3d47302afd5..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_25.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_50.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_50.png
deleted file mode 100644
index 744b46f1ef8..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_50.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_75.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_75.png
deleted file mode 100644
index 4fbd689bb4c..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_75.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json
deleted file mode 100644
index 61ab52970b1..00000000000
--- a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/7917d83bac9cddd14c0ca0b457256b2683cc047f/icons/obj/items/surgery_tools.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bone-gel"
-    },
-    {
-      "name": "predator_bone-gel"
-    },
-    {
-      "name": "bone-gel_75"
-    },
-    {
-      "name": "bone-gel_50"
-    },
-    {
-      "name": "bone-gel_25"
-    },
-    {
-      "name": "bone-gel_0"
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/predator_bone-gel.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/predator_bone-gel.png
deleted file mode 100644
index 4eb66f5843a..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/predator_bone-gel.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/bonesetter.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/bonesetter.png
deleted file mode 100644
index 08b79677c86..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/bonesetter.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-left.png
deleted file mode 100644
index 5dbbacced17..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-right.png
deleted file mode 100644
index 3b9942e76d2..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/meta.json
deleted file mode 100644
index 04cb7db3b74..00000000000
--- a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "bonesetter"
-		},
-        {
-            "name": "predator_bonesetter"
-        },
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/predator_bonesetter.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/predator_bonesetter.png
deleted file mode 100644
index c77903ff77a..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/predator_bonesetter.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/insertion.png b/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/insertion.png
deleted file mode 100644
index 961c3c641a7..00000000000
Binary files a/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/insertion.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/meta.json
deleted file mode 100644
index af2b78c1ea8..00000000000
--- a/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Aurorastation at https://github.com/Aurorastation/Aurora.3/commit/ac435b98e2d0a455ad319dca3bb9bfdc0cd8b051",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "insertion"
-		}
-	]
-}
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-advanced-surgery.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-advanced-surgery.png
deleted file mode 100644
index 291a889e4c1..00000000000
Binary files a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-advanced-surgery.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-surgery.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-surgery.png
deleted file mode 100644
index 8147a74b761..00000000000
Binary files a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-surgery.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 644a78b47d8..74c9893cae3 100644
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -100,12 +100,6 @@
     {
       "name": "icon-treatment"
     },
-    {
-      "name": "icon-surgery"
-    },
-    {
-      "name": "icon-advanced-surgery"
-    },
     {
       "name": "icon-syndicate"
     },
diff --git a/Resources/Textures/Shaders/saturationscale.swsl b/Resources/Textures/Shaders/saturationscale.swsl
deleted file mode 100644
index 9829e207629..00000000000
--- a/Resources/Textures/Shaders/saturationscale.swsl
+++ /dev/null
@@ -1,12 +0,0 @@
-uniform highp float saturation; // Between 0 and 2;
-uniform sampler2D SCREEN_TEXTURE;
-
-void fragment() {
-    highp vec4 color = texture(SCREEN_TEXTURE, UV);
-
-    highp float brightness = (color.r + color.g + color.b) / 3.0;
-
-    color.rgb = mix(vec3(brightness), color.rgb, saturation);
-
-    COLOR = color;
-}
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/advancedRetractor-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/advancedRetractor-equipped-BELT.png
deleted file mode 100644
index 807150ae0df..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/advancedRetractor-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/advancedRetractor.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/advancedRetractor.png
deleted file mode 100644
index 58dd325667d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/advancedRetractor.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/cautery-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/cautery-equipped-BELT.png
deleted file mode 100644
index fe9d2a7bcc5..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/cautery-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/cautery.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/cautery.png
deleted file mode 100644
index 48c987471bf..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/cautery.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/drill-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/drill-equipped-BELT.png
deleted file mode 100644
index 2f7a29ecbc2..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/drill-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/drill.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/drill.png
deleted file mode 100644
index 492adda6b00..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/drill.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyCautery-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyCautery-equipped-BELT.png
deleted file mode 100644
index cd5c4f58589..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyCautery-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyCautery.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyCautery.png
deleted file mode 100644
index fcb3b42726d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyCautery.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyScalpel-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyScalpel-equipped-BELT.png
deleted file mode 100644
index 0ef847d059a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyScalpel-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyScalpel.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyScalpel.png
deleted file mode 100644
index 97dcdc9c278..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/energyScalpel.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/hemostat-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/hemostat-equipped-BELT.png
deleted file mode 100644
index af539d1c33c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/hemostat-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/hemostat.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/hemostat.png
deleted file mode 100644
index 5f0683f85ac..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/hemostat.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/meta.json
deleted file mode 100644
index 5140c382fad..00000000000
--- a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/meta.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Ko4erga",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "hemostat"
-    },
-    {
-      "name": "scalpel"
-    },
-    {
-      "name": "energyScalpel"
-    },
-    {
-      "name": "scalpelLaser"
-    },
-    {
-      "name": "retractor"
-    },
-    {
-      "name": "advancedRetractor"
-    },
-    {
-      "name": "cautery"
-    },
-    {
-      "name": "energyCautery"
-    },
-    {
-      "name": "drill"
-    },
-    {
-      "name": "sawElectric"
-    },
-    {
-      "name": "hemostat-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "scalpel-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "energyScalpel-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "scalpelLaser-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "retractor-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "advancedRetractor-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "cautery-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "energyCautery-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "drill-equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "sawElectric-equipped-BELT",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/retractor-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/retractor-equipped-BELT.png
deleted file mode 100644
index 5f88693b677..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/retractor-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/retractor.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/retractor.png
deleted file mode 100644
index 4f7022e5932..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/retractor.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/sawElectric-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/sawElectric-equipped-BELT.png
deleted file mode 100644
index e9b291b4db2..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/sawElectric-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/sawElectric.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/sawElectric.png
deleted file mode 100644
index 5b83c8aa728..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/sawElectric.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpel-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpel-equipped-BELT.png
deleted file mode 100644
index 99143251d35..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpel-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpel.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpel.png
deleted file mode 100644
index 0520cfefb43..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpel.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpelLaser-equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpelLaser-equipped-BELT.png
deleted file mode 100644
index 4b0d1db5784..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpelLaser-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpelLaser.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpelLaser.png
deleted file mode 100644
index edff5a6df2a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/belt_overlay.rsi/scalpelLaser.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/equipped-BELT.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/equipped-BELT.png
deleted file mode 100644
index 1b4fa4b04b6..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/icon.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/icon.png
deleted file mode 100644
index 6e1cdc087e1..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/inhand-left.png
deleted file mode 100644
index d1c565f6efa..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/inhand-right.png
deleted file mode 100644
index 36769a922f5..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/meta.json b/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/meta.json
deleted file mode 100644
index a01a9c6cb9b..00000000000
--- a/Resources/Textures/_CorvaxNext/Clothing/Belt/surgical_board.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Interface/Misc/job_icons.rsi/Surgeon.png b/Resources/Textures/_CorvaxNext/Interface/Misc/job_icons.rsi/Surgeon.png
deleted file mode 100644
index 380806ec385..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Interface/Misc/job_icons.rsi/Surgeon.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_CorvaxNext/Interface/Misc/job_icons.rsi/meta.json
deleted file mode 100644
index d3ffa189e6e..00000000000
--- a/Resources/Textures/_CorvaxNext/Interface/Misc/job_icons.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Surgeon by Ko4erga",
-
-    "size": {
-        "x": 8,
-        "y": 8
-    },
-    "states": [
-        {
-            "name": "Surgeon"
-        }
-    ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi/meta.json
deleted file mode 100644
index cdecf550def..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from and modified by deltanedas (github) for GoobStation",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "tail"
-        },
-        {
-            "name": "torso"
-        }
-    ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi/tail.png b/Resources/Textures/_CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi/tail.png
deleted file mode 100644
index bb0b9458102..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi/tail.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi/torso.png b/Resources/Textures/_CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi/torso.png
deleted file mode 100644
index ab0f5ff82f0..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Aliens/Carps/carp_parts.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/head.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/head.png
deleted file mode 100644
index 81c98564b9a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/meta.json
deleted file mode 100644
index 9f87381cd87..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/head.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/head.png
deleted file mode 100644
index a89de820f47..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-combined.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-combined.png
deleted file mode 100644
index a6ddbf35891..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-combined.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-primary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-primary.png
deleted file mode 100644
index 5d6b133523b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-primary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-secondary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-secondary.png
deleted file mode 100644
index de40773897f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-tertiary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-tertiary.png
deleted file mode 100644
index 7b83ecf161b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-tertiary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_foot.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_foot.png
deleted file mode 100644
index 534085a97c3..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_hand.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_hand.png
deleted file mode 100644
index 771cd025a86..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-combined.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-combined.png
deleted file mode 100644
index 915b2af4d37..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-combined.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-primary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-primary.png
deleted file mode 100644
index 05f568654e6..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-primary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-secondary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-secondary.png
deleted file mode 100644
index a96f9eb3854..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/meta.json
deleted file mode 100644
index 94020ddda5b..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/meta.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-primary",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-secondary",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-combined",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-primary",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-secondary",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-combined",
-      "directions": 4
-    },
-    {
-      "name": "torso-primary",
-      "directions": 4
-    },
-    {
-      "name": "torso-secondary",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-primary",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-secondary",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-tertiary",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-combined",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-primary",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-secondary",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-tertiary",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-combined",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-combined.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-combined.png
deleted file mode 100644
index eabc7e4bd88..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-combined.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-primary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-primary.png
deleted file mode 100644
index c8087d3fc19..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-primary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-secondary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-secondary.png
deleted file mode 100644
index 2cf2346bd84..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-tertiary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-tertiary.png
deleted file mode 100644
index 0b5cecfd6c3..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-tertiary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_foot.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_foot.png
deleted file mode 100644
index a8fbe8635ea..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_hand.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_hand.png
deleted file mode 100644
index db11be34056..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-combined.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-combined.png
deleted file mode 100644
index a035dd86265..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-combined.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-primary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-primary.png
deleted file mode 100644
index d6288eedc3c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-primary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-secondary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-secondary.png
deleted file mode 100644
index 7a406c93187..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-primary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-primary.png
deleted file mode 100644
index 08cabfc99dc..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-primary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-secondary.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-secondary.png
deleted file mode 100644
index 4e61c144a95..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head-2.png
deleted file mode 100644
index ca3cb6e9e36..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head.png
deleted file mode 100644
index a175f4dfcec..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/meta.json
deleted file mode 100644
index ea5456fea10..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-1.png
deleted file mode 100644
index 51a3c40058f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-2.png
deleted file mode 100644
index 17fbf43df08..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-3.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-3.png
deleted file mode 100644
index e59e1c1d382..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-3.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/meta.json
deleted file mode 100644
index 5e35e7226fd..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-	{
-      "name": "head-2",
-      "directions": 4
-    },
-	{
-      "name": "head-3",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-1.png
deleted file mode 100644
index 54ecbe28321..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-2.png
deleted file mode 100644
index c9a529d9ebb..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-1.png
deleted file mode 100644
index a4e96f5d745..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-2.png
deleted file mode 100644
index 6be2024018b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-1.png
deleted file mode 100644
index 87466284b3b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-2.png
deleted file mode 100644
index b871a179333..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-1.png
deleted file mode 100644
index 880384f5ee9..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-2.png
deleted file mode 100644
index 90b10eb4be5..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/meta.json
deleted file mode 100644
index 9f4ca1ee51f..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/meta.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "l_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "torso-1",
-      "directions": 4
-    },
-    {
-      "name": "torso-2",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-1.png
deleted file mode 100644
index 5e770056ed9..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-2.png
deleted file mode 100644
index 56b363d862a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-1.png
deleted file mode 100644
index 8994994011c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-2.png
deleted file mode 100644
index 9ca884025fd..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-1.png
deleted file mode 100644
index 13a46c2e092..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-2.png
deleted file mode 100644
index d203e571fca..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-1.png
deleted file mode 100644
index bb762db0c49..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-2.png
deleted file mode 100644
index 16f0ee16471..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-1.png
deleted file mode 100644
index 45fb93052e4..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-2.png
deleted file mode 100644
index a8782ac3b04..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-1.png
deleted file mode 100644
index 21e0ccbbcb8..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-2.png
deleted file mode 100644
index 0d351d8822a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/meta.json
deleted file mode 100644
index 9d2654d15cb..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/head.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/head.png
deleted file mode 100644
index bed52ce6714..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/meta.json
deleted file mode 100644
index 9f87381cd87..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/head.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/head.png
deleted file mode 100644
index 63a66c5f866..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_arm.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_arm.png
deleted file mode 100644
index 9813e583feb..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_foot.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_foot.png
deleted file mode 100644
index 468d4f38989..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_hand.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_hand.png
deleted file mode 100644
index 05df57f392f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_leg.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_leg.png
deleted file mode 100644
index 236edc982e1..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/meta.json
deleted file mode 100644
index 118c3f613c0..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/meta.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_leg",
-      "directions": 4
-    },
-    {
-      "name": "r_leg",
-      "directions": 4
-    },
-    {
-      "name": "torso",
-      "directions": 4
-    },
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_arm.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_arm.png
deleted file mode 100644
index 27ba8e0d263..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_foot.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_foot.png
deleted file mode 100644
index e0b3dd55b59..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_hand.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_hand.png
deleted file mode 100644
index 716f604b4f3..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_leg.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_leg.png
deleted file mode 100644
index 92a0aa7b475..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/torso.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/torso.png
deleted file mode 100644
index 49afe13d65a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-1.png
deleted file mode 100644
index d89df4071be..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-2.png
deleted file mode 100644
index 1540a6cac40..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/meta.json
deleted file mode 100644
index 576edfc9c56..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99.",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-	{
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-1.png
deleted file mode 100644
index f5694178c58..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-2.png
deleted file mode 100644
index f87f611652a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-1.png
deleted file mode 100644
index 4ee57febec2..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-2.png
deleted file mode 100644
index fcdf5bf6504..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-1.png
deleted file mode 100644
index 381573480ff..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-2.png
deleted file mode 100644
index c502e77a18f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-1.png
deleted file mode 100644
index a4bee8acb48..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-2.png
deleted file mode 100644
index 0be292d26c2..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/meta.json
deleted file mode 100644
index 9f4ca1ee51f..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/meta.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "l_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "torso-1",
-      "directions": 4
-    },
-    {
-      "name": "torso-2",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-1.png
deleted file mode 100644
index b2a1996652f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-2.png
deleted file mode 100644
index a79a0eb6483..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-1.png
deleted file mode 100644
index da79cffbc9b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-2.png
deleted file mode 100644
index 90b5deb87c4..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-1.png
deleted file mode 100644
index 9d4084b0ca1..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-2.png
deleted file mode 100644
index a2cc6b71a67..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-1.png
deleted file mode 100644
index 5d1bc5a60da..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-2.png
deleted file mode 100644
index b2b85c3213d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-1.png
deleted file mode 100644
index c757f06420a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-2.png
deleted file mode 100644
index cd822361bf4..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-1.png
deleted file mode 100644
index 99add5cc504..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-2.png
deleted file mode 100644
index 0d5ffd6c10e..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/meta.json
deleted file mode 100644
index 9d2654d15cb..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/head.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/head.png
deleted file mode 100644
index 9fbd2083d1d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/meta.json
deleted file mode 100644
index ef992f309c8..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/head.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/head.png
deleted file mode 100644
index c50698e68ce..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_arm.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_arm.png
deleted file mode 100644
index 1c5f646e36e..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_foot.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_foot.png
deleted file mode 100644
index 45d9e8e2460..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_hand.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_hand.png
deleted file mode 100644
index 062d14745c0..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_leg.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_leg.png
deleted file mode 100644
index f120754830b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/meta.json
deleted file mode 100644
index f30906990a5..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/meta.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_leg",
-      "directions": 4
-    },
-    {
-      "name": "r_leg",
-      "directions": 4
-    },
-    {
-      "name": "torso",
-      "directions": 4
-    },
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_arm.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_arm.png
deleted file mode 100644
index 24e15d419ad..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_foot.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_foot.png
deleted file mode 100644
index f04c2fd7a64..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_hand.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_hand.png
deleted file mode 100644
index 287556a83a0..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_leg.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_leg.png
deleted file mode 100644
index 653101e63af..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/torso.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/torso.png
deleted file mode 100644
index ad1bd42ca6c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/head.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/head.png
deleted file mode 100644
index 31ef25deb56..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/meta.json
deleted file mode 100644
index 9f87381cd87..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-1.png
deleted file mode 100644
index fe3943fac0d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-2.png
deleted file mode 100644
index baf6e438f81..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/meta.json
deleted file mode 100644
index 576edfc9c56..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99.",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-	{
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-1.png
deleted file mode 100644
index 48cf08df079..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-2.png
deleted file mode 100644
index 1ef9cc0473f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-1.png
deleted file mode 100644
index 38b28406ac5..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-2.png
deleted file mode 100644
index 0d745f2d566..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-1.png
deleted file mode 100644
index 72a1d92d83f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-2.png
deleted file mode 100644
index d61d58b478a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-1.png
deleted file mode 100644
index 6e813b8b631..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-2.png
deleted file mode 100644
index 89106d6420b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/meta.json
deleted file mode 100644
index 35c1cad74bd..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/meta.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot-1",
-      "directions": 4
-    },{
-      "name": "l_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "torso-1",
-      "directions": 4
-    },
-    {
-      "name": "torso-2",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-1.png
deleted file mode 100644
index 0409bb02fe1..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-2.png
deleted file mode 100644
index 061988dbcd4..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-1.png
deleted file mode 100644
index ef8b2b141aa..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-2.png
deleted file mode 100644
index 74d17c3c734..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-1.png
deleted file mode 100644
index 9d9dfb2848a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-2.png
deleted file mode 100644
index 9d4e6c3e167..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-1.png
deleted file mode 100644
index 7ef9033cc0f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-2.png
deleted file mode 100644
index cb88587d550..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-1.png
deleted file mode 100644
index db42c9a82bf..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-2.png
deleted file mode 100644
index 70271b0c3a2..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-1.png
deleted file mode 100644
index e48ad79298c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-2.png
deleted file mode 100644
index bf1903f4bcc..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/meta.json
deleted file mode 100644
index 9d2654d15cb..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/groin.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/groin.png
deleted file mode 100644
index 29ae064b0d6..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/groin.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-1.png
deleted file mode 100644
index 792a57e81d9..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-2.png
deleted file mode 100644
index 14e7e83c2fd..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-1.png
deleted file mode 100644
index 93064d56057..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-2.png
deleted file mode 100644
index 7df87a8915a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-1.png
deleted file mode 100644
index 8fb9ec75e2c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-2.png
deleted file mode 100644
index 767bd0d4d6d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-1.png
deleted file mode 100644
index d0660f1bc15..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-2.png
deleted file mode 100644
index 5bb2251d140..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-1.png
deleted file mode 100644
index 4ce036704ff..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-2.png
deleted file mode 100644
index 237eb32d6e4..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/meta.json
deleted file mode 100644
index bf863d580f6..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/meta.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version by Timemaster99",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "l_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "groin",
-      "directions": 4
-    },
-    {
-      "name": "torso-1",
-      "directions": 4
-    },
-    {
-      "name": "torso-2",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-1.png
deleted file mode 100644
index 6bd612a5d33..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-2.png
deleted file mode 100644
index 69be000d908..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-1.png
deleted file mode 100644
index f3f1b5121d0..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-2.png
deleted file mode 100644
index d5a6fb2a71c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-1.png
deleted file mode 100644
index a77c7f00e67..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-2.png
deleted file mode 100644
index e8d557eae81..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-1.png
deleted file mode 100644
index effbab2037d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-2.png
deleted file mode 100644
index 5e22421eb82..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-1.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-1.png
deleted file mode 100644
index 0e1480d6986..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-2.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-2.png
deleted file mode 100644
index d6bffee42c2..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/ears.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/ears.png
deleted file mode 100644
index 9966cc2ac2d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/ears.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/eyeball-l.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/eyeball-l.png
deleted file mode 100644
index 09b98e316f8..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/eyeball-l.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/eyeball-r.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/eyeball-r.png
deleted file mode 100644
index f1ff37a002f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/eyeball-r.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/eyes.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/eyes.png
deleted file mode 100644
index 0fb6412e1c3..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/eyes.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/heart-off.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/heart-off.png
deleted file mode 100644
index 7dda0d3a8e6..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/heart-off.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/heart-on.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/heart-on.png
deleted file mode 100644
index 676a641989a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/heart-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/meta.json
deleted file mode 100644
index 2905c5cbd07..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/meta.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Yogstation",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "heart-off"
-    },
-    {
-      "name": "heart-on",
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "eyes"
-    },
-    {
-      "name": "eyeball-r"
-    },
-    {
-      "name": "tongue"
-    },
-    {
-      "name": "eyeball-l"
-    },
-    {
-      "name": "microcell",
-      "delays": [
-        [
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "ears"
-    }
-  ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/microcell.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/microcell.png
deleted file mode 100644
index 18b692a5a99..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/microcell.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/tongue.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/tongue.png
deleted file mode 100644
index dee2ed3b99f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/organs.rsi/tongue.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/full.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/full.png
deleted file mode 100644
index 7faae4a077e..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/head_f.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/head_f.png
deleted file mode 100644
index 31d77176c96..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/head_f.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/head_m.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/head_m.png
deleted file mode 100644
index 53d6069a283..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_arm.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_arm.png
deleted file mode 100644
index 4f042bf40e0..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_foot.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_foot.png
deleted file mode 100644
index bb9bede2180..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_hand.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_hand.png
deleted file mode 100644
index 5b6c2df090c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_leg.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_leg.png
deleted file mode 100644
index 788f2769d43..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/meta.json
deleted file mode 100644
index 1463c57a060..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/meta.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "version": 2,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Original drawn by @robustyanka on Discord, modified by @pspritechologist",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "full"
-    },
-    {
-      "name": "head_m",
-      "directions": 4
-    },
-    {
-      "name": "head_f",
-      "directions": 4
-    },
-    {
-      "name": "torso_m",
-      "directions": 4
-    },
-    {
-      "name": "torso_f",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    },
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_leg",
-      "directions": 4
-    },
-    {
-      "name": "l_leg",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_foot",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_arm.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_arm.png
deleted file mode 100644
index 6c1ff1ec9cf..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_foot.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_foot.png
deleted file mode 100644
index 2389c30aea5..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_hand.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_hand.png
deleted file mode 100644
index 3ec4fab0378..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_leg.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_leg.png
deleted file mode 100644
index f424b2efbca..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/torso_f.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/torso_f.png
deleted file mode 100644
index b36a2eed8c7..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/torso_m.png b/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/torso_m.png
deleted file mode 100644
index df2588b562d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/IPC/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi/l_arm.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi/l_arm.png
deleted file mode 100644
index d2838e8b7d4..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi/meta.json
deleted file mode 100644
index 27215dfbca6..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Agoichi (823598558690934824)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi/r_arm.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi/r_arm.png
deleted file mode 100644
index a85b505f90e..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Misc/Pizza/parts.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/organs.rsi/lung-l.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/organs.rsi/lung-l.png
deleted file mode 100644
index 32aca484b9f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/organs.rsi/lung-l.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/organs.rsi/lung-r.png b/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/organs.rsi/lung-r.png
deleted file mode 100644
index 7e29649ccd8..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/organs.rsi/lung-r.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/organs.rsi/meta.json b/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/organs.rsi/meta.json
deleted file mode 100644
index e639085d8d0..00000000000
--- a/Resources/Textures/_CorvaxNext/Mobs/Species/Resomi/organs.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "lung-l"
-    },
-    {
-      "name": "lung-r"
-    }
-  ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor-on.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor-on.png
deleted file mode 100644
index 32e3da4497f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor.png
deleted file mode 100644
index 7df819a183e..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left-on.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left-on.png
deleted file mode 100644
index 3c2e8972821..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left.png
deleted file mode 100644
index 9a93d2bb5fc..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right-on.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right-on.png
deleted file mode 100644
index f91961a9df3..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right.png
deleted file mode 100644
index 6444d084235..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/meta.json
deleted file mode 100644
index 592796b3e08..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/adv-retractor.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "adv-retractor"
-		},
-		{
-      "name": "adv-retractor-on"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-on",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-on",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/bone-gel.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/bone-gel.png
deleted file mode 100644
index ac425d8014c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/bone-gel.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-left.png
deleted file mode 100644
index 2cd6321ee66..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-right.png
deleted file mode 100644
index 549de0c4134..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/meta.json
deleted file mode 100644
index cb021eef6bf..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/bone-gel.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-    "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "bone-gel"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png
deleted file mode 100644
index f82e7f12a0b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png
deleted file mode 100644
index dcc6bd69467..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png
deleted file mode 100644
index 1c1cc9c4d80..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json
deleted file mode 100644
index 4b08c30b53e..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "cautery"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/circular-saw.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/circular-saw.png
deleted file mode 100644
index 816095a7fc0..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/circular-saw.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-left.png
deleted file mode 100644
index fb5a065550e..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-right.png
deleted file mode 100644
index c0e064d10b1..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/meta.json
deleted file mode 100644
index 42163ea24d7..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/circular-saw.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "circular-saw"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/drapes.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/drapes.png
deleted file mode 100644
index 1119569bdd7..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/drapes.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-left.png
deleted file mode 100644
index 7531299f2a4..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-right.png
deleted file mode 100644
index 57fea9b7e25..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/meta.json
deleted file mode 100644
index 9c30d1b15d5..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drapes.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "drapes"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/drill.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/drill.png
deleted file mode 100644
index 1f141fb217b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/drill.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png
deleted file mode 100644
index e2108b95a74..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png
deleted file mode 100644
index 991fbea280d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/meta.json
deleted file mode 100644
index a9c84b52f01..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/drill.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "drill"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery-on.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery-on.png
deleted file mode 100644
index d0a512e94e7..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery.png
deleted file mode 100644
index 2cd5b0e97c0..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left-on.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left-on.png
deleted file mode 100644
index 46e8c431e91..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left.png
deleted file mode 100644
index 1ffa9e522ae..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right-on.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right-on.png
deleted file mode 100644
index 1bbb5332060..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right.png
deleted file mode 100644
index fa95ce487dd..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/meta.json
deleted file mode 100644
index 4a4c2c11d67..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-cautery.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "e-cautery"
-		},
-		{
-            "name": "e-cautery-on"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-on",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-on",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel-on.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel-on.png
deleted file mode 100644
index 04a27c34bbb..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel.png
deleted file mode 100644
index 1fbf799b60d..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left-on.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left-on.png
deleted file mode 100644
index 72cbd3608f6..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left.png
deleted file mode 100644
index 151705c9588..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right-on.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right-on.png
deleted file mode 100644
index 358f397c5e5..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right-on.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right.png
deleted file mode 100644
index 70a64d2b0e6..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/meta.json
deleted file mode 100644
index 701445e8ab8..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/e-scalpel.rsi/meta.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "e-scalpel"
-		},
-		{
-            "name": "e-scalpel-on",
-            "delays": [
-                [
-                    0.1,
-                    0.1
-                ]
-            ]
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-on",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-on",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/hemostat.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/hemostat.png
deleted file mode 100644
index 951d323a52f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/hemostat.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-left.png
deleted file mode 100644
index eb331bac35e..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-right.png
deleted file mode 100644
index b83b2b02c0b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/meta.json
deleted file mode 100644
index afbaa9cd516..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/hemostat.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "hemostat"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-left.png
deleted file mode 100644
index 4f9d45bdb9f..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-right.png
deleted file mode 100644
index 70464f12119..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/meta.json
deleted file mode 100644
index ff849d1338c..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b7c3ac536391a3dfe3046f3b5197721af4564d90",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "omnimed"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/omnimed.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/omnimed.png
deleted file mode 100644
index 9e0031744da..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/omnimed.rsi/omnimed.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-left.png
deleted file mode 100644
index a23bdae4c5b..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-right.png
deleted file mode 100644
index cced67007f5..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/meta.json
deleted file mode 100644
index a38e04dcfd2..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "retractor"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/retractor.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/retractor.png
deleted file mode 100644
index 24e04fe613a..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/retractor.rsi/retractor.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png
deleted file mode 100644
index 726e388eca1..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png
deleted file mode 100644
index ed4b405d90c..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json
deleted file mode 100644
index 7cbc1208942..00000000000
--- a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "scalpel"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png b/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png
deleted file mode 100644
index 44ec06e4631..00000000000
Binary files a/Resources/Textures/_CorvaxNext/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png and /dev/null differ
diff --git a/Resources/Textures/_CorvaxNext/Structures/Machines/limbgrower.rsi/meta.json b/Resources/Textures/_CorvaxNext/Structures/Machines/limbgrower.rsi/meta.json
deleted file mode 100644
index 9705a9b9651..00000000000
--- a/Resources/Textures/_CorvaxNext/Structures/Machines/limbgrower.rsi/meta.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/pull/75878, all icons under CC-BY-SA-3.0, unless otherwise indicated.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "limbgrower_fill",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "limbgrower_unfill",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "limbgrower_openpanel",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "limbgrower_idleoff",
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "limbgrower_idleon",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "limbgrower_panelopen"
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/meta.json
deleted file mode 100644
index cdecf550def..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from and modified by deltanedas (github) for GoobStation",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "tail"
-        },
-        {
-            "name": "torso"
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/tail.png b/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/tail.png
deleted file mode 100644
index bb0b9458102..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/tail.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/torso.png b/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/torso.png
deleted file mode 100644
index ab0f5ff82f0..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/head.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/head.png
deleted file mode 100644
index 81c98564b9a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/meta.json
deleted file mode 100644
index 9f87381cd87..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/head.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/head.png
deleted file mode 100644
index a89de820f47..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-combined.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-combined.png
deleted file mode 100644
index a6ddbf35891..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-combined.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-primary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-primary.png
deleted file mode 100644
index 5d6b133523b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-primary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-secondary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-secondary.png
deleted file mode 100644
index de40773897f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-tertiary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-tertiary.png
deleted file mode 100644
index 7b83ecf161b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_arm-tertiary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_foot.png
deleted file mode 100644
index 534085a97c3..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_hand.png
deleted file mode 100644
index 771cd025a86..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-combined.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-combined.png
deleted file mode 100644
index 915b2af4d37..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-combined.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-primary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-primary.png
deleted file mode 100644
index 05f568654e6..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-primary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-secondary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-secondary.png
deleted file mode 100644
index a96f9eb3854..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/l_leg-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/meta.json
deleted file mode 100644
index 94020ddda5b..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/meta.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-primary",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-secondary",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-combined",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-primary",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-secondary",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-combined",
-      "directions": 4
-    },
-    {
-      "name": "torso-primary",
-      "directions": 4
-    },
-    {
-      "name": "torso-secondary",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-primary",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-secondary",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-tertiary",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-combined",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-primary",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-secondary",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-tertiary",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-combined",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-combined.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-combined.png
deleted file mode 100644
index eabc7e4bd88..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-combined.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-primary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-primary.png
deleted file mode 100644
index c8087d3fc19..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-primary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-secondary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-secondary.png
deleted file mode 100644
index 2cf2346bd84..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-tertiary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-tertiary.png
deleted file mode 100644
index 0b5cecfd6c3..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_arm-tertiary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_foot.png
deleted file mode 100644
index a8fbe8635ea..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_hand.png
deleted file mode 100644
index db11be34056..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-combined.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-combined.png
deleted file mode 100644
index a035dd86265..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-combined.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-primary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-primary.png
deleted file mode 100644
index d6288eedc3c..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-primary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-secondary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-secondary.png
deleted file mode 100644
index 7a406c93187..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/r_leg-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-primary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-primary.png
deleted file mode 100644
index 08cabfc99dc..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-primary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-secondary.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-secondary.png
deleted file mode 100644
index 4e61c144a95..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi/torso-secondary.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head-2.png
deleted file mode 100644
index ca3cb6e9e36..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head.png
deleted file mode 100644
index a175f4dfcec..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/meta.json
deleted file mode 100644
index ea5456fea10..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-1.png
deleted file mode 100644
index 51a3c40058f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-2.png
deleted file mode 100644
index 17fbf43df08..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-3.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-3.png
deleted file mode 100644
index e59e1c1d382..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/head-3.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/meta.json
deleted file mode 100644
index 5e35e7226fd..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-	{
-      "name": "head-2",
-      "directions": 4
-    },
-	{
-      "name": "head-3",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-1.png
deleted file mode 100644
index 54ecbe28321..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-2.png
deleted file mode 100644
index c9a529d9ebb..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-1.png
deleted file mode 100644
index a4e96f5d745..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-2.png
deleted file mode 100644
index 6be2024018b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-1.png
deleted file mode 100644
index 87466284b3b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-2.png
deleted file mode 100644
index b871a179333..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-1.png
deleted file mode 100644
index 880384f5ee9..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-2.png
deleted file mode 100644
index 90b10eb4be5..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/l_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/meta.json
deleted file mode 100644
index 9f4ca1ee51f..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/meta.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "l_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "torso-1",
-      "directions": 4
-    },
-    {
-      "name": "torso-2",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-1.png
deleted file mode 100644
index 5e770056ed9..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-2.png
deleted file mode 100644
index 56b363d862a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-1.png
deleted file mode 100644
index 8994994011c..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-2.png
deleted file mode 100644
index 9ca884025fd..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-1.png
deleted file mode 100644
index 13a46c2e092..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-2.png
deleted file mode 100644
index d203e571fca..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-1.png
deleted file mode 100644
index bb762db0c49..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-2.png
deleted file mode 100644
index 16f0ee16471..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/r_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-1.png
deleted file mode 100644
index 45fb93052e4..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-2.png
deleted file mode 100644
index a8782ac3b04..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-1.png
deleted file mode 100644
index 21e0ccbbcb8..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-2.png
deleted file mode 100644
index 0d351d8822a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/meta.json
deleted file mode 100644
index 9d2654d15cb..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/head.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/head.png
deleted file mode 100644
index bed52ce6714..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/meta.json
deleted file mode 100644
index 9f87381cd87..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/head.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/head.png
deleted file mode 100644
index 63a66c5f866..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_arm.png
deleted file mode 100644
index 9813e583feb..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_foot.png
deleted file mode 100644
index 468d4f38989..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_hand.png
deleted file mode 100644
index 05df57f392f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_leg.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_leg.png
deleted file mode 100644
index 236edc982e1..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/meta.json
deleted file mode 100644
index 118c3f613c0..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/meta.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_leg",
-      "directions": 4
-    },
-    {
-      "name": "r_leg",
-      "directions": 4
-    },
-    {
-      "name": "torso",
-      "directions": 4
-    },
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_arm.png
deleted file mode 100644
index 27ba8e0d263..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_foot.png
deleted file mode 100644
index e0b3dd55b59..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_hand.png
deleted file mode 100644
index 716f604b4f3..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_leg.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_leg.png
deleted file mode 100644
index 92a0aa7b475..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/torso.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/torso.png
deleted file mode 100644
index 49afe13d65a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-1.png
deleted file mode 100644
index d89df4071be..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-2.png
deleted file mode 100644
index 1540a6cac40..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/meta.json
deleted file mode 100644
index 576edfc9c56..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99.",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-	{
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-1.png
deleted file mode 100644
index f5694178c58..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-2.png
deleted file mode 100644
index f87f611652a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-1.png
deleted file mode 100644
index 4ee57febec2..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-2.png
deleted file mode 100644
index fcdf5bf6504..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-1.png
deleted file mode 100644
index 381573480ff..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-2.png
deleted file mode 100644
index c502e77a18f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-1.png
deleted file mode 100644
index a4bee8acb48..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-2.png
deleted file mode 100644
index 0be292d26c2..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/l_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/meta.json
deleted file mode 100644
index 9f4ca1ee51f..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/meta.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "l_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "torso-1",
-      "directions": 4
-    },
-    {
-      "name": "torso-2",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-1.png
deleted file mode 100644
index b2a1996652f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-2.png
deleted file mode 100644
index a79a0eb6483..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-1.png
deleted file mode 100644
index da79cffbc9b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-2.png
deleted file mode 100644
index 90b5deb87c4..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-1.png
deleted file mode 100644
index 9d4084b0ca1..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-2.png
deleted file mode 100644
index a2cc6b71a67..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-1.png
deleted file mode 100644
index 5d1bc5a60da..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-2.png
deleted file mode 100644
index b2b85c3213d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/r_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-1.png
deleted file mode 100644
index c757f06420a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-2.png
deleted file mode 100644
index cd822361bf4..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-1.png
deleted file mode 100644
index 99add5cc504..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-2.png
deleted file mode 100644
index 0d5ffd6c10e..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/meta.json
deleted file mode 100644
index 9d2654d15cb..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/head.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/head.png
deleted file mode 100644
index 9fbd2083d1d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/meta.json
deleted file mode 100644
index ef992f309c8..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/head.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/head.png
deleted file mode 100644
index c50698e68ce..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_arm.png
deleted file mode 100644
index 1c5f646e36e..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_foot.png
deleted file mode 100644
index 45d9e8e2460..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_hand.png
deleted file mode 100644
index 062d14745c0..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_leg.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_leg.png
deleted file mode 100644
index f120754830b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/meta.json
deleted file mode 100644
index f30906990a5..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/meta.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_leg",
-      "directions": 4
-    },
-    {
-      "name": "r_leg",
-      "directions": 4
-    },
-    {
-      "name": "torso",
-      "directions": 4
-    },
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_arm.png
deleted file mode 100644
index 24e15d419ad..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_foot.png
deleted file mode 100644
index f04c2fd7a64..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_hand.png
deleted file mode 100644
index 287556a83a0..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_leg.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_leg.png
deleted file mode 100644
index 653101e63af..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/torso.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/torso.png
deleted file mode 100644
index ad1bd42ca6c..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/head.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/head.png
deleted file mode 100644
index 31ef25deb56..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/meta.json
deleted file mode 100644
index 9f87381cd87..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-1.png
deleted file mode 100644
index fe3943fac0d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-2.png
deleted file mode 100644
index baf6e438f81..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/meta.json
deleted file mode 100644
index 576edfc9c56..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99.",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-	{
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-1.png
deleted file mode 100644
index 48cf08df079..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-2.png
deleted file mode 100644
index 1ef9cc0473f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-1.png
deleted file mode 100644
index 38b28406ac5..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-2.png
deleted file mode 100644
index 0d745f2d566..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-1.png
deleted file mode 100644
index 72a1d92d83f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-2.png
deleted file mode 100644
index d61d58b478a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-1.png
deleted file mode 100644
index 6e813b8b631..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-2.png
deleted file mode 100644
index 89106d6420b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/l_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/meta.json
deleted file mode 100644
index 35c1cad74bd..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/meta.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot-1",
-      "directions": 4
-    },{
-      "name": "l_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "torso-1",
-      "directions": 4
-    },
-    {
-      "name": "torso-2",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-1.png
deleted file mode 100644
index 0409bb02fe1..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-2.png
deleted file mode 100644
index 061988dbcd4..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-1.png
deleted file mode 100644
index ef8b2b141aa..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-2.png
deleted file mode 100644
index 74d17c3c734..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-1.png
deleted file mode 100644
index 9d9dfb2848a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-2.png
deleted file mode 100644
index 9d4e6c3e167..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-1.png
deleted file mode 100644
index 7ef9033cc0f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-2.png
deleted file mode 100644
index cb88587d550..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/r_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-1.png
deleted file mode 100644
index db42c9a82bf..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-2.png
deleted file mode 100644
index 70271b0c3a2..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-1.png
deleted file mode 100644
index e48ad79298c..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-2.png
deleted file mode 100644
index bf1903f4bcc..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/meta.json
deleted file mode 100644
index 9d2654d15cb..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/groin.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/groin.png
deleted file mode 100644
index 29ae064b0d6..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/groin.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-1.png
deleted file mode 100644
index 792a57e81d9..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-2.png
deleted file mode 100644
index 14e7e83c2fd..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/head-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-1.png
deleted file mode 100644
index 93064d56057..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-2.png
deleted file mode 100644
index 7df87a8915a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-1.png
deleted file mode 100644
index 8fb9ec75e2c..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-2.png
deleted file mode 100644
index 767bd0d4d6d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-1.png
deleted file mode 100644
index d0660f1bc15..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-2.png
deleted file mode 100644
index 5bb2251d140..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-1.png
deleted file mode 100644
index 4ce036704ff..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-2.png
deleted file mode 100644
index 237eb32d6e4..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/l_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/meta.json
deleted file mode 100644
index bf863d580f6..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/meta.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version by Timemaster99",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "l_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-1",
-      "directions": 4
-    },
-    {
-      "name": "r_foot-2",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "l_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-1",
-      "directions": 4
-    },
-    {
-      "name": "r_leg-2",
-      "directions": 4
-    },
-    {
-      "name": "groin",
-      "directions": 4
-    },
-    {
-      "name": "torso-1",
-      "directions": 4
-    },
-    {
-      "name": "torso-2",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "l_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-1",
-      "directions": 4
-    },
-    {
-      "name": "r_arm-2",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "l_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-1",
-      "directions": 4
-    },
-    {
-      "name": "r_hand-2",
-      "directions": 4
-    },
-    {
-      "name": "head-1",
-      "directions": 4
-    },
-    {
-      "name": "head-2",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-1.png
deleted file mode 100644
index 6bd612a5d33..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-2.png
deleted file mode 100644
index 69be000d908..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_arm-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-1.png
deleted file mode 100644
index f3f1b5121d0..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-2.png
deleted file mode 100644
index d5a6fb2a71c..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_foot-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-1.png
deleted file mode 100644
index a77c7f00e67..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-2.png
deleted file mode 100644
index e8d557eae81..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_hand-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-1.png
deleted file mode 100644
index effbab2037d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-2.png
deleted file mode 100644
index 5e22421eb82..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/r_leg-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-1.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-1.png
deleted file mode 100644
index 0e1480d6986..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-2.png b/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-2.png
deleted file mode 100644
index d6bffee42c2..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/ears.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/ears.png
deleted file mode 100644
index 9966cc2ac2d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/ears.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/eyeball-l.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/eyeball-l.png
deleted file mode 100644
index 09b98e316f8..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/eyeball-l.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/eyeball-r.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/eyeball-r.png
deleted file mode 100644
index f1ff37a002f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/eyeball-r.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/eyes.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/eyes.png
deleted file mode 100644
index 0fb6412e1c3..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/eyes.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/heart-off.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/heart-off.png
deleted file mode 100644
index 7dda0d3a8e6..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/heart-off.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/heart-on.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/heart-on.png
deleted file mode 100644
index 676a641989a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/heart-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/meta.json
deleted file mode 100644
index 2905c5cbd07..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/meta.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Yogstation",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "heart-off"
-    },
-    {
-      "name": "heart-on",
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "eyes"
-    },
-    {
-      "name": "eyeball-r"
-    },
-    {
-      "name": "tongue"
-    },
-    {
-      "name": "eyeball-l"
-    },
-    {
-      "name": "microcell",
-      "delays": [
-        [
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "ears"
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/microcell.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/microcell.png
deleted file mode 100644
index 18b692a5a99..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/microcell.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/tongue.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/tongue.png
deleted file mode 100644
index dee2ed3b99f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/organs.rsi/tongue.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/full.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/full.png
deleted file mode 100644
index 7faae4a077e..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/head_f.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/head_f.png
deleted file mode 100644
index 31d77176c96..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/head_f.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/head_m.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/head_m.png
deleted file mode 100644
index 53d6069a283..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_arm.png
deleted file mode 100644
index 4f042bf40e0..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_foot.png
deleted file mode 100644
index bb9bede2180..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_hand.png
deleted file mode 100644
index 5b6c2df090c..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_leg.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_leg.png
deleted file mode 100644
index 788f2769d43..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/meta.json
deleted file mode 100644
index 1463c57a060..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/meta.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "version": 2,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Original drawn by @robustyanka on Discord, modified by @pspritechologist",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "full"
-    },
-    {
-      "name": "head_m",
-      "directions": 4
-    },
-    {
-      "name": "head_f",
-      "directions": 4
-    },
-    {
-      "name": "torso_m",
-      "directions": 4
-    },
-    {
-      "name": "torso_f",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    },
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_leg",
-      "directions": 4
-    },
-    {
-      "name": "l_leg",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_foot",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_arm.png
deleted file mode 100644
index 6c1ff1ec9cf..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_foot.png
deleted file mode 100644
index 2389c30aea5..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_hand.png
deleted file mode 100644
index 3ec4fab0378..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_leg.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_leg.png
deleted file mode 100644
index f424b2efbca..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/torso_f.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/torso_f.png
deleted file mode 100644
index b36a2eed8c7..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/torso_m.png b/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/torso_m.png
deleted file mode 100644
index df2588b562d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/IPC/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/l_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/l_arm.png
deleted file mode 100644
index d2838e8b7d4..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/meta.json
deleted file mode 100644
index 27215dfbca6..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Agoichi (823598558690934824)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/r_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/r_arm.png
deleted file mode 100644
index a85b505f90e..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor-on.png
deleted file mode 100644
index 32e3da4497f..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor.png
deleted file mode 100644
index 7df819a183e..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left-on.png
deleted file mode 100644
index 3c2e8972821..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left.png
deleted file mode 100644
index 9a93d2bb5fc..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right-on.png
deleted file mode 100644
index f91961a9df3..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right.png
deleted file mode 100644
index 6444d084235..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/meta.json
deleted file mode 100644
index 592796b3e08..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "adv-retractor"
-		},
-		{
-      "name": "adv-retractor-on"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-on",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-on",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/bone-gel.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/bone-gel.png
deleted file mode 100644
index ac425d8014c..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/bone-gel.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-left.png
deleted file mode 100644
index 2cd6321ee66..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-right.png
deleted file mode 100644
index 549de0c4134..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/meta.json
deleted file mode 100644
index 48775ff522a..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "bone-gel"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png
deleted file mode 100644
index f82e7f12a0b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png
deleted file mode 100644
index dcc6bd69467..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png
deleted file mode 100644
index 1c1cc9c4d80..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json
deleted file mode 100644
index 4b08c30b53e..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "cautery"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/circular-saw.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/circular-saw.png
deleted file mode 100644
index 816095a7fc0..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/circular-saw.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-left.png
deleted file mode 100644
index fb5a065550e..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-right.png
deleted file mode 100644
index c0e064d10b1..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/meta.json
deleted file mode 100644
index 42163ea24d7..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "circular-saw"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/drapes.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/drapes.png
deleted file mode 100644
index 1119569bdd7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/drapes.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-left.png
deleted file mode 100644
index 7531299f2a4..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-right.png
deleted file mode 100644
index 57fea9b7e25..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/meta.json
deleted file mode 100644
index 9c30d1b15d5..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "drapes"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/drill.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/drill.png
deleted file mode 100644
index 1f141fb217b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/drill.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png
deleted file mode 100644
index e2108b95a74..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png
deleted file mode 100644
index 991fbea280d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/meta.json
deleted file mode 100644
index a9c84b52f01..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "drill"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery-on.png
deleted file mode 100644
index d0a512e94e7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery.png
deleted file mode 100644
index 2cd5b0e97c0..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left-on.png
deleted file mode 100644
index 46e8c431e91..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left.png
deleted file mode 100644
index 1ffa9e522ae..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right-on.png
deleted file mode 100644
index 1bbb5332060..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right.png
deleted file mode 100644
index fa95ce487dd..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/meta.json
deleted file mode 100644
index 4a4c2c11d67..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "e-cautery"
-		},
-		{
-            "name": "e-cautery-on"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-on",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-on",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel-on.png
deleted file mode 100644
index 04a27c34bbb..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel.png
deleted file mode 100644
index 1fbf799b60d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left-on.png
deleted file mode 100644
index 72cbd3608f6..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left.png
deleted file mode 100644
index 151705c9588..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right-on.png
deleted file mode 100644
index 358f397c5e5..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right.png
deleted file mode 100644
index 70a64d2b0e6..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/meta.json
deleted file mode 100644
index 701445e8ab8..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/meta.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "e-scalpel"
-		},
-		{
-            "name": "e-scalpel-on",
-            "delays": [
-                [
-                    0.1,
-                    0.1
-                ]
-            ]
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-on",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-on",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/hemostat.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/hemostat.png
deleted file mode 100644
index 951d323a52f..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/hemostat.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-left.png
deleted file mode 100644
index eb331bac35e..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-right.png
deleted file mode 100644
index b83b2b02c0b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/meta.json
deleted file mode 100644
index afbaa9cd516..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "hemostat"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-left.png
deleted file mode 100644
index 4f9d45bdb9f..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-right.png
deleted file mode 100644
index 70464f12119..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/meta.json
deleted file mode 100644
index ff849d1338c..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b7c3ac536391a3dfe3046f3b5197721af4564d90",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "omnimed"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/omnimed.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/omnimed.png
deleted file mode 100644
index 9e0031744da..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/omnimed.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-left.png
deleted file mode 100644
index a23bdae4c5b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-right.png
deleted file mode 100644
index cced67007f5..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/meta.json
deleted file mode 100644
index a38e04dcfd2..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "retractor"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/retractor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/retractor.png
deleted file mode 100644
index 24e04fe613a..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/retractor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png
deleted file mode 100644
index 726e388eca1..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png
deleted file mode 100644
index ed4b405d90c..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json
deleted file mode 100644
index 7cbc1208942..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "scalpel"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png
deleted file mode 100644
index 44ec06e4631..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png and /dev/null differ
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 4c803855265..75ce04f40fa 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -1,4 +1,4 @@
-version: 1 # Not used right now, whatever.
+version: 1 # Not used right now, whatever.
 binds:
 - function: UIClick
   type: State
@@ -70,27 +70,21 @@ binds:
 - function: CameraRotateLeft
   type: State
   key: NumpadNum7
-  mod1: Control
 - function: CameraRotateRight
   type: State
   key: NumpadNum9
-  mod1: Control
 - function: CameraReset
   type: State
   key: NumpadNum8
-  mod1: Control
 - function: ZoomOut
   type: State
   key: NumpadNum4
-  mod1: Control
 - function: ZoomIn
   type: State
   key: NumpadNum6
-  mod1: Control
 - function: ResetZoom
   type: State
   key: NumpadNum5
-  mod1: Control
 # Misc
 - function: ShowEscapeMenu
   type: State
@@ -590,25 +584,6 @@ binds:
   type: State
   key: MouseRight
   canFocus: true
-# _CorvaxNext: surgery Targeting
-- function: TargetHead
-  type: State
-  key: NumpadNum8
-- function: TargetTorso
-  type: State
-  key: NumpadNum5
-- function: TargetLeftArm
-  type: State
-  key: NumpadNum6
-- function: TargetRightArm
-  type: State
-  key: NumpadNum4
-- function: TargetLeftLeg
-  type: State
-  key: NumpadNum3
-- function: TargetRightLeg
-  type: State
-  key: NumpadNum1
 - function: OfferItem # Corvax-Next-Offer
   type: State
   key: F