Remove the other use of make_unique