Removed some unneeded unique_ptr usage