Merge "Remove old WSS key from config"