GXFS trademark clean up

Merge request reports