remove unused macro imports, fix mobile reviewers (bug 976319)