MNT: Changed unique_dict generation and removed keys from the data labels