got rid of makeUnique.h include and std::make_unique calls.