Addresses item 18 of ATLASRECTS-5936 by using unique_ptr, also (by the way) resolves cppcheck warnings.