cleanup with Entity.setAspect and Registry.addItem