Merge "Remove unused key usermailererror"