diff --git a/Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs b/Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs
index 68da2348a4..5bc3a31be6 100644
--- a/Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs
+++ b/Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs
@@ -34,9 +34,9 @@ namespace Content.Client.GameObjects.Components.Construction
             Owner.GetComponent<ITransformComponent>();
         }
 
-        public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
+        public override void HandleMessage(ComponentMessage message, IComponent component)
         {
-            base.HandleNetworkMessage(message, channel, session);
+            base.HandleMessage(message, component);
 
             switch (message)
             {
@@ -65,9 +65,23 @@ namespace Content.Client.GameObjects.Components.Construction
                     _gameHud.CraftingButtonVisible = false;
                     break;
 
+                default:
+                    break;
+            }
+        }
+
+        public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
+        {
+            base.HandleNetworkMessage(message, channel, session);
+
+            switch (message)
+            {
                 case AckStructureConstructionMessage ackMsg:
                     ClearGhost(ackMsg.Ack);
                     break;
+
+                default:
+                    break;
             }
         }
 
diff --git a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs
index 8981267f51..74e040398e 100644
--- a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs
+++ b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs
@@ -171,32 +171,6 @@ namespace Content.Client.GameObjects
             }
         }
 
-        public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
-        {
-            base.HandleNetworkMessage(message, channel, session);
-
-            switch (message)
-            {
-                case PlayerAttachedMsg _:
-                    if (_gui == null)
-                    {
-                        _gui = new HandsGui();
-                    }
-                    else
-                    {
-                        _gui.Parent?.RemoveChild(_gui);
-                    }
-
-                    _gameHud.HandsContainer.AddChild(_gui);
-                    _gui.UpdateHandIcons();
-                    break;
-
-                case PlayerDetachedMsg _:
-                    _gui.Parent?.RemoveChild(_gui);
-                    break;
-            }
-        }
-
         public void SendChangeHand(string index)
         {
             SendNetworkMessage(new ClientChangedHandMsg(index));
diff --git a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs b/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
index 134869504b..aa1b3ff26a 100644
--- a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
+++ b/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
@@ -63,18 +63,6 @@ namespace Content.Client.GameObjects.Components.Mobs
             _updateEye();
         }
 
-        public override void HandleMessage(ComponentMessage message, IComponent component)
-        {
-            base.HandleMessage(message, component);
-
-            switch (message)
-            {
-                case RecoilKickMessage msg:
-                    Kick(msg.Recoil);
-                    break;
-            }
-        }
-
         public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
         {
             base.HandleNetworkMessage(message, channel, session);
diff --git a/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs b/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
index 71da8c2294..5b5c24d579 100644
--- a/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
+++ b/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
@@ -67,19 +67,6 @@ namespace Content.Client.GameObjects
             }
         }
 
-        public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
-        {
-            switch (message)
-            {
-                case PlayerAttachedMsg _:
-                    SetOverlay(_currentEffect);
-                    break;
-                case PlayerDetachedMsg _:
-                    RemoveOverlay();
-                    break;
-            }
-        }
-
         public override void HandleComponentState(ComponentState curState, ComponentState nextState)
         {
             base.HandleComponentState(curState, nextState);