Remove useless std::unique_ptr usage
Refactor/rename