remove unique_ptr_void remnants