Use custom std::unique_ptr deleter to more safely handle owning poi…

Use custom std::unique_ptr deleter to more safely handle owning poi… #4245