more prospective changes in porting code to use unique_ptr