Update tokens and remove value

Update tokens and remove value