diff --git a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
index 9e9a08e32f..a7996eb8dd 100644
--- a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
+++ b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
@@ -1,5 +1,4 @@
-using System;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Inventory;
 using Content.Shared.GameObjects.Components.Items;
 using Robust.Client.Graphics;
@@ -16,7 +15,6 @@ namespace Content.Client.GameObjects.Components.Clothing
         private FemaleClothingMask _femaleMask;
         public override string Name => "Clothing";
         public override uint? NetID => ContentNetIDs.CLOTHING;
-        public override Type StateType => typeof(ClothingComponentState);
 
         [ViewVariables(VVAccess.ReadWrite)]
         public string ClothingEquippedPrefix { get; set; }
diff --git a/Content.Client/GameObjects/Components/Items/ItemComponent.cs b/Content.Client/GameObjects/Components/Items/ItemComponent.cs
index 80eed4d948..f1b01f57ff 100644
--- a/Content.Client/GameObjects/Components/Items/ItemComponent.cs
+++ b/Content.Client/GameObjects/Components/Items/ItemComponent.cs
@@ -1,5 +1,4 @@
-using System;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Items;
 using Robust.Client.Graphics;
 using Robust.Client.Interfaces.ResourceManagement;
@@ -18,7 +17,6 @@ namespace Content.Client.GameObjects
     {
         public override string Name => "Item";
         public override uint? NetID => ContentNetIDs.ITEM;
-        public override Type StateType => typeof(ItemComponentState);
 
         [ViewVariables] protected ResourcePath RsiPath;
 
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponent.cs
index b933c51c0f..b5eb8bd044 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponent.cs
+++ b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponent.cs
@@ -70,7 +70,6 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged
 
         public override string Name => "BallisticMagazineWeapon";
         public override uint? NetID => ContentNetIDs.BALLISTIC_MAGAZINE_WEAPON;
-        public override Type StateType => typeof(BallisticMagazineWeaponComponentState);
 
         private StatusControl _statusControl;
 
diff --git a/Content.Client/GameObjects/Components/WelderComponent.cs b/Content.Client/GameObjects/Components/WelderComponent.cs
index 3cb91380db..088894e1d3 100644
--- a/Content.Client/GameObjects/Components/WelderComponent.cs
+++ b/Content.Client/GameObjects/Components/WelderComponent.cs
@@ -17,7 +17,6 @@ namespace Content.Client.GameObjects.Components
     {
         public override string Name => "Welder";
         public override uint? NetID => ContentNetIDs.WELDER;
-        public override Type StateType => typeof(WelderComponentState);
 
         [ViewVariables] public float FuelCapacity { get; private set; }
         [ViewVariables] public float Fuel { get; private set; }
diff --git a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
index 0e879e0f54..1d60955d62 100644
--- a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
@@ -19,7 +19,6 @@ namespace Content.Server.GameObjects
     {
         public override string Name => "Clothing";
         public override uint? NetID => ContentNetIDs.CLOTHING;
-        public override Type StateType => typeof(ClothingComponentState);
 
         public SlotFlags SlotFlags = SlotFlags.PREVENTEQUIP; //Different from None, NONE allows equips if no slot flags are required
 
diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
index 02c3e4f20e..e9d6d03ad2 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
@@ -1,5 +1,4 @@
-using System;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Items;
@@ -21,7 +20,6 @@ namespace Content.Server.GameObjects
     {
         public override string Name => "Item";
         public override uint? NetID => ContentNetIDs.ITEM;
-        public override Type StateType => typeof(ItemComponentState);
 
         #pragma warning disable 649
         [Dependency] private readonly IRobustRandom _robustRandom;
diff --git a/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs b/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs
index 9a4898e888..cd7debb0ab 100644
--- a/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs
+++ b/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs
@@ -10,7 +10,6 @@ namespace Content.Shared.GameObjects.Components.Cargo
     {
         public sealed override string Name => "CargoOrderDatabase";
         public sealed override uint? NetID => ContentNetIDs.CARGO_ORDER_DATABASE;
-        public sealed override Type StateType => typeof(CargoOrderDatabaseState);
     }
 
     [NetSerializable, Serializable]
diff --git a/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs b/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs
index f2be864dc6..8f39c13724 100644
--- a/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs
+++ b/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs
@@ -13,7 +13,6 @@ namespace Content.Shared.GameObjects.Components.Cargo
     {
         public sealed override string Name => "GalacticMarket";
         public sealed override uint? NetID => ContentNetIDs.GALACTIC_MARKET;
-        public sealed override Type StateType => typeof(GalacticMarketState);
 
         protected List<CargoProductPrototype> _products = new List<CargoProductPrototype>();
 
diff --git a/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs
index f2df59ecd5..2624d79cef 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs
+++ b/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs
@@ -66,9 +66,6 @@ namespace Content.Shared.GameObjects.Components.Chemistry
         /// <inheritdoc />
         public sealed override uint? NetID => ContentNetIDs.SOLUTION;
 
-        /// <inheritdoc />
-        public sealed override Type StateType => typeof(SolutionComponentState);
-
         /// <inheritdoc />
         public override void ExposeData(ObjectSerializer serializer)
         {
diff --git a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
index c81e2ae086..656efbaf82 100644
--- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
+++ b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
@@ -9,7 +9,6 @@ namespace Content.Shared.GameObjects
     {
         public override string Name => "Damageable";
         public sealed override uint? NetID => ContentNetIDs.DAMAGEABLE;
-        public sealed override Type StateType => typeof(DamageComponentState);
     }
 
     // The IDs of the items get synced over the network.
diff --git a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
index 7dfb88f4d4..cf49d55e09 100644
--- a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
+++ b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
@@ -19,7 +19,6 @@ namespace Content.Shared.GameObjects
 
         public sealed override string Name => "Inventory";
         public sealed override uint? NetID => ContentNetIDs.STORAGE;
-        public sealed override Type StateType => typeof(InventoryComponentState);
 
         [ViewVariables]
         protected Inventory InventoryInstance { get; private set; }
diff --git a/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs b/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs
index 1cfd8021b0..9943c7f9a3 100644
--- a/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs
+++ b/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs
@@ -12,7 +12,6 @@ namespace Content.Shared.GameObjects.Components.Items
     public sealed class ItemCooldownComponent : Component
     {
         public override string Name => "ItemCooldown";
-        public override Type StateType => typeof(ItemCooldownComponentState);
         public override uint? NetID => ContentNetIDs.ITEMCOOLDOWN;
 
         private TimeSpan? _cooldownEnd;
diff --git a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs b/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs
index ff6c4ba512..dc3604eae6 100644
--- a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs
+++ b/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs
@@ -9,7 +9,6 @@ namespace Content.Shared.GameObjects
     {
         public sealed override string Name => "Hands";
         public sealed override uint? NetID => ContentNetIDs.HANDS;
-        public sealed override Type StateType => typeof(HandsComponentState);
     }
 
     // The IDs of the items get synced over the network.
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs
index 6275aa8a38..047d4c2cce 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs
+++ b/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs
@@ -8,7 +8,6 @@ namespace Content.Shared.GameObjects.Components.Mobs
     {
         public sealed override uint? NetID => ContentNetIDs.COMBATMODE;
         public override string Name => "CombatMode";
-        public sealed override Type StateType => typeof(CombatModeComponentState);
 
         [Serializable, NetSerializable]
         protected sealed class CombatModeComponentState : ComponentState
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs
index cc3871790e..b50430a8d5 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs
+++ b/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs
@@ -13,7 +13,6 @@ namespace Content.Shared.GameObjects.Components.Mobs
 
         public sealed override string Name => "HumanoidAppearance";
         public sealed override uint? NetID => ContentNetIDs.HUMANOID_APPEARANCE;
-        public sealed override Type StateType => typeof(HumanoidAppearanceComponentState);
 
         [ViewVariables(VVAccess.ReadWrite)]
         public virtual HumanoidCharacterAppearance Appearance
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs
index 681efcd60b..07b2b839c2 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs
+++ b/Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs
@@ -11,7 +11,6 @@ namespace Content.Shared.GameObjects.Components.Mobs
     {
         public override string Name => "OverlayEffectsUI";
         public sealed override uint? NetID => ContentNetIDs.OVERLAYEFFECTS;
-        public sealed override Type StateType => typeof(OverlayEffectComponentState);
     }
 
     public enum ScreenEffects
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedStatusEffectsComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedStatusEffectsComponent.cs
index cf3a245097..48c2e1c2fd 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedStatusEffectsComponent.cs
+++ b/Content.Shared/GameObjects/Components/Mobs/SharedStatusEffectsComponent.cs
@@ -13,8 +13,6 @@ namespace Content.Shared.GameObjects.Components.Mobs
     {
         public override string Name => "StatusEffectsUI";
         public override uint? NetID => ContentNetIDs.STATUSEFFECTS;
-        public sealed override Type StateType => typeof(StatusEffectComponentState);
-
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs
index 3c1e87a0dc..fea10d01f4 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs
+++ b/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs
@@ -13,7 +13,6 @@ namespace Content.Shared.GameObjects.Components.Research
     {
         public override string Name => "LatheDatabase";
         public override uint? NetID => ContentNetIDs.LATHE_DATABASE;
-        public override Type StateType => typeof(LatheDatabaseState);
 
         private List<LatheRecipePrototype> _recipes = new List<LatheRecipePrototype>();
 
diff --git a/Content.Shared/GameObjects/Components/Research/SharedMaterialStorageComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedMaterialStorageComponent.cs
index d72dae1a75..5ded848a25 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedMaterialStorageComponent.cs
+++ b/Content.Shared/GameObjects/Components/Research/SharedMaterialStorageComponent.cs
@@ -14,7 +14,6 @@ namespace Content.Shared.GameObjects.Components.Research
         protected virtual Dictionary<string, int> Storage { get; set; }
         public override string Name => "MaterialStorage";
         public sealed override uint? NetID => ContentNetIDs.MATERIAL_STORAGE;
-        public sealed override Type StateType => typeof(MaterialStorageState);
 
         public int this[string ID]
         {
diff --git a/Content.Shared/GameObjects/Components/Research/SharedProtolatheDatabaseComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedProtolatheDatabaseComponent.cs
index a0694f87ef..9fb52757fe 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedProtolatheDatabaseComponent.cs
+++ b/Content.Shared/GameObjects/Components/Research/SharedProtolatheDatabaseComponent.cs
@@ -14,7 +14,6 @@ namespace Content.Shared.GameObjects.Components.Research
     {
         public override string Name => "ProtolatheDatabase";
         public sealed override uint? NetID => ContentNetIDs.PROTOLATHE_DATABASE;
-        public sealed override Type StateType => typeof(ProtolatheDatabaseState);
 
         private List<LatheRecipePrototype> _protolatheRecipes = new List<LatheRecipePrototype>();
 
diff --git a/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs
index 52fe45880e..d76b42260f 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs
+++ b/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs
@@ -13,7 +13,6 @@ namespace Content.Shared.GameObjects.Components.Research
     {
         public override string Name => "TechnologyDatabase";
         public override uint? NetID => ContentNetIDs.TECHNOLOGY_DATABASE;
-        public override Type StateType => typeof(TechnologyDatabaseState);
 
         protected List<TechnologyPrototype> _technologies = new List<TechnologyPrototype>();
 
diff --git a/Content.Shared/GameObjects/Components/SharedHandheldLightComponent.cs b/Content.Shared/GameObjects/Components/SharedHandheldLightComponent.cs
index c6b5eab02a..ecc9229693 100644
--- a/Content.Shared/GameObjects/Components/SharedHandheldLightComponent.cs
+++ b/Content.Shared/GameObjects/Components/SharedHandheldLightComponent.cs
@@ -8,7 +8,6 @@ namespace Content.Shared.GameObjects.Components
     {
         public sealed override string Name => "HandheldLight";
         public sealed override uint? NetID => ContentNetIDs.HANDHELD_LIGHT;
-        public sealed override Type StateType => typeof(HandheldLightComponentState);
 
         [Serializable, NetSerializable]
         protected sealed class HandheldLightComponentState : ComponentState
diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs
index 006ef53565..3a141d4d4d 100644
--- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs
+++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs
@@ -8,7 +8,6 @@ namespace Content.Shared.GameObjects.Components
     {
         public sealed override string Name => "Stack";
         public sealed override uint? NetID => ContentNetIDs.STACK;
-        public sealed override Type StateType => typeof(StackComponentState);
 
         [Serializable, NetSerializable]
         protected sealed class StackComponentState : ComponentState
diff --git a/RobustToolbox b/RobustToolbox
index 343667442b..df9be436c4 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 343667442b1b61ecfa62a1f80aee320f227346e2
+Subproject commit df9be436c4c9a015651cb3babb169112fe1c7cdf