diff --git a/Content.Server/GameObjects/Components/ComputerComponent.cs b/Content.Server/GameObjects/Components/ComputerComponent.cs
index 0b88de6cfc..4a1ce95bc2 100644
--- a/Content.Server/GameObjects/Components/ComputerComponent.cs
+++ b/Content.Server/GameObjects/Components/ComputerComponent.cs
@@ -28,13 +28,6 @@ namespace Content.Server.GameObjects.Components
             }
         }
 
-        protected override void Startup()
-        {
-            base.Startup();
-
-            CreateComputerBoard();
-        }
-
         public override void HandleMessage(ComponentMessage message, IComponent? component)
         {
             base.HandleMessage(message, component);
diff --git a/Content.Server/GameObjects/Components/Construction/MachineComponent.cs b/Content.Server/GameObjects/Components/Construction/MachineComponent.cs
index 5499987e07..62d2ff618e 100644
--- a/Content.Server/GameObjects/Components/Construction/MachineComponent.cs
+++ b/Content.Server/GameObjects/Components/Construction/MachineComponent.cs
@@ -23,15 +23,8 @@ namespace Content.Server.GameObjects.Components.Construction
         {
             base.Initialize();
 
-            _boardContainer = ContainerHelpers.EnsureContainer<Container>(Owner, MachineFrameComponent.BoardContainer);
-            _partContainer = ContainerHelpers.EnsureContainer<Container>(Owner, MachineFrameComponent.PartContainer);
-        }
-
-        protected override void Startup()
-        {
-            base.Startup();
-
-            CreateBoardAndStockParts();
+            _boardContainer = Owner.EnsureContainer<Container>(MachineFrameComponent.BoardContainer);
+            _partContainer = Owner.EnsureContainer<Container>(MachineFrameComponent.PartContainer);
         }
 
         public IEnumerable<MachinePartComponent> GetAllParts()
@@ -54,8 +47,8 @@ namespace Content.Server.GameObjects.Components.Construction
         public void CreateBoardAndStockParts()
         {
             // Entity might not be initialized yet.
-            var boardContainer = ContainerHelpers.EnsureContainer<Container>(Owner, MachineFrameComponent.BoardContainer, out var existedBoard);
-            var partContainer = ContainerHelpers.EnsureContainer<Container>(Owner, MachineFrameComponent.PartContainer, out var existedParts);
+            var boardContainer = Owner.EnsureContainer<Container>(MachineFrameComponent.BoardContainer, out var existedBoard);
+            var partContainer = Owner.EnsureContainer<Container>(MachineFrameComponent.PartContainer, out var existedParts);
 
             if (string.IsNullOrEmpty(BoardPrototype))
                 return;