Disable name/email fields for registration.
Remove unused macro.
Fix tests.