There are still hold as instances in the map. As soon as this switches to pointers, delete here.