remove NSA and GCHQ qualifiers to improve readability