edit: do delete here, the map changed to hold pointers already