Tentative: use iPhone-safe URIs
Fix two-factor removal, forced addition of two-factor
Remove unnecessary test file
Fix reference