Merge "Remove CONF values from Token clients"