Move APIs which look like they need to be deprecated.
Obfuscating emails is a pointless exercise
Deprecate unsafe API
Remove unnecessary calls