[TASK] Remove usage of property $new_unique_uid