Removed redudant client ID tokens