Completely removed use of unique_ptrs.