Clean up logic for clearing phone numbers