Use unique_ptr rather than raw pointers
Remove unused field