Merge "Remove obsolete Swap alerts"