Search for removed key has been moved out of setSaved