Gateway Janitorial

[uwp_reset]