diff --git a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
index e2ea56e403..63e55e0d14 100644
--- a/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
+++ b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
@@ -31,11 +31,6 @@ namespace Content.Shared.Construction.Steps
                 return typeof(TagConstructionGraphStep);
             }
 
-            if (node.Has("prototype"))
-            {
-                return typeof(PrototypeConstructionGraphStep);
-            }
-
             if (node.Has("allTags") || node.Has("anyTags"))
             {
                 return typeof(MultipleTagsConstructionGraphStep);
diff --git a/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs b/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
deleted file mode 100644
index b6b975846d..0000000000
--- a/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Linq;
-
-namespace Content.Shared.Construction.Steps
-{
-    [DataDefinition]
-    public sealed class PrototypeConstructionGraphStep : ArbitraryInsertConstructionGraphStep
-    {
-        [DataField("prototype")]
-        private string _prototype = "BaseItem";
-
-        [DataField("allowParents")]
-        private bool _allowParents;
-
-        public override bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory)
-        {
-            entityManager.TryGetComponent(uid, out MetaDataComponent? metaDataComponent);
-            if (metaDataComponent?.EntityPrototype == null)
-                return false;
-
-            if (metaDataComponent.EntityPrototype.ID == _prototype)
-                return true;
-            if (_allowParents && metaDataComponent.EntityPrototype.Parents != null)
-                return metaDataComponent.EntityPrototype.Parents.Contains(_prototype);
-            return false;
-        }
-    }
-}
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 1d5c20a69c..93fe221985 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -67,6 +67,7 @@
     - type: Tag
       tags:
         - ForceableFollow
+        - PlushieGhost
     - type: RandomWalk
       accumulatorRatio: 0.5
       maxSpeed: 1
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 18dcf699a8..01f1306a9d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -137,6 +137,7 @@
     - type: Tag
       tags:
         - Trash
+        - Ectoplasm
     - type: SolutionContainerManager
       solutions:
         food:
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
index b08356e5ce..97eae37807 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
@@ -6,10 +6,16 @@
       edges:
         - to: plushie
           steps:
-            - prototype: PlushieGhost
-              name: a ghost plushie
-            - prototype: Ectoplasm
+            - tag: PlushieGhost
+              name: ghost soft toy
+              icon:
+                sprite: Mobs/Ghosts/ghost_human.rsi
+                state: icon
+            - tag: Ectoplasm
               name: ectoplasm
+              icon:
+                sprite: Mobs/Ghosts/revenant.rsi
+                state: ectoplasm
               doAfter: 10
     - node: plushie
       entity: PlushieGhostRevenant
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index a3c9da935e..fbfaa252f2 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -239,6 +239,9 @@
 - type: Tag
   id: DroneUsable
 
+- type: Tag
+  id: Ectoplasm
+
 - type: Tag
   id: Egg
 
@@ -558,6 +561,9 @@
 - type: Tag
   id: Plastic
 
+- type: Tag
+  id: PlushieGhost
+
 - type: Tag
   id: Powerdrill