[FOLLOWUP][TASK] Deprecate RemoveXSS