[TASK] Cleanup RemoveXSS