Simplify unique_ptr deletes

unique_ptr provides simple methods for deleting the object. This help protects against delete/delete[] mistakes.

I simplify some uses.