GRID-256 remove qualifiers from tokens