Make these vectors of shared_ptrs instead. That get rid of many SAFE_DELETES