Merge "Remove Unique ID which is not used anywhere."