Prototype retention

I changed up how Entities are removed, so that when Prototypes are moved
around, they are still correctly referenced to.