diff --git a/.mailmap b/.mailmap
index 312e51d854..a1ff601d78 100644
--- a/.mailmap
+++ b/.mailmap
@@ -234,3 +234,54 @@ meowsbits <b5c6@protonmail.com> <45600330+meowsbits@users.noreply.github.com>
 nedifi <103940716+nedifi@users.noreply.github.com>
 
 Максим Чусовлянов <mchusovlianov@gmail.com>
+
+Adrian Sutton <adrian@oplabs.co>
+Adrian Sutton <adrian@oplabs.co> <adrian@symphonious.net>
+
+Andrei Silviu Dragnea <andreidragnea.dev@gmail.com>
+Andrei Silviu Dragnea <andreidragnea.dev@gmail.com> <andreisilviudragnea@gmail.com>
+
+Domino Valdano <dominoplural@gmail.com>
+Domino Valdano <dominoplural@gmail.com> <jeff@okcupid.com>
+
+James Prestwich <james@prestwi.ch>
+James Prestwich <james@prestwi.ch> <10149425+prestwich@users.noreply.github.com>
+
+Jeremy Schlatter <jeremy.schlatter@gmail.com>
+Jeremy Schlatter <jeremy.schlatter@gmail.com> <jeremy@jeremyschlatter.com>
+
+Karl Bartel <karl.bartel@clabs.co>
+Karl Bartel <karl.bartel@clabs.co> <karl@karl.berlin>
+
+Paweł Bylica <chfast@gmail.com>
+Paweł Bylica <chfast@gmail.com> <pawel@ethereum.org>
+
+Roberto Bayardo <bayardo@alum.mit.edu>
+Roberto Bayardo <bayardo@alum.mit.edu> <roberto.bayardo@coinbase.com>
+
+Sebastian Stammler <seb@oplabs.co>
+Sebastian Stammler <seb@oplabs.co> <stammler.s@gmail.com>
+
+Seungbae Yu <dbadoy4874@gmail.com>
+Seungbae Yu <dbadoy4874@gmail.com> <72970043+dbadoy@users.noreply.github.com>
+
+guangwu <guoguangwu@magic-shield.com>
+guangwu <guoguangwu@magic-shield.com> <guoguangwug@gmail.com>
+
+henridf <henri@dubfer.com>
+henridf <henri@dubfer.com> <henridf@gmail.com>
+
+lmittmann <3458786+lmittmann@users.noreply.github.com>
+lmittmann <3458786+lmittmann@users.noreply.github.com> <lmittmann@users.noreply.github.com>
+
+makcandrov <makcandrov@proton.me>
+makcandrov <makcandrov@proton.me> <108467407+makcandrov@users.noreply.github.com>
+
+tianyeyouyou <tianyeyouyou@gmail.com>
+tianyeyouyou <tianyeyouyou@gmail.com> <150894831+tianyeyouyou@users.noreply.github.com>
+
+ucwong <ethereum2k@gmail.com>
+ucwong <ethereum2k@gmail.com> <ucwong@126.com>
+
+yzb <335357057@qq.com>
+yzb <335357057@qq.com> <flyingyzb@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index a934ca2f15..c7f6eeafc8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,7 +17,6 @@ Adam Schmideg <adamschmideg@users.noreply.github.com>
 Aditya <adityasripal@gmail.com>
 Aditya Arora <arora.aditya520@gmail.com>
 Adrian Sutton <adrian@oplabs.co>
-Adrian Sutton <adrian@symphonious.net>
 Adrià Cidre <adria.cidre@gmail.com>
 Afanasii Kurakin <afanasy@users.noreply.github.com>
 Afri Schoedon <5chdn@users.noreply.github.com>
@@ -60,7 +59,6 @@ Andrea Franz <andrea@gravityblast.com>
 Andrei Kostakov <bps@dzen.ws>
 Andrei Maiboroda <andrei@ethereum.org>
 Andrei Silviu Dragnea <andreidragnea.dev@gmail.com>
-Andrei Silviu Dragnea <andreisilviudragnea@gmail.com>
 Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com>
 Andrey Petrov <shazow@gmail.com>
 Andryanau Kanstantsin <andrianov.dev@yandex.by>
@@ -199,7 +197,6 @@ Dmitrij Koniajev <dimchansky@gmail.com>
 Dmitry Shulyak <yashulyak@gmail.com>
 Dmitry Zenovich <dzenovich@gmail.com>
 Domino Valdano <dominoplural@gmail.com>
-Domino Valdano <jeff@okcupid.com>
 DongXi Huang <418498589@qq.com>
 Dragan Milic <dragan@netice9.com>
 dragonvslinux <35779158+dragononcrypto@users.noreply.github.com>
@@ -269,7 +266,6 @@ Greg Colvin <greg@colvin.org>
 Gregg Dourgarian <greggd@tempworks.com>
 Gregory Markou <16929357+GregTheGreek@users.noreply.github.com>
 guangwu <guoguangwu@magic-shield.com>
-guangwu <guoguangwug@gmail.com>
 Guido Vranken <guidovranken@users.noreply.github.com>
 Guifel <toowik@gmail.com>
 Guilherme Salgado <gsalgado@gmail.com>
@@ -301,7 +297,6 @@ Hendrik Hofstadt <hendrik@nexantic.com>
 Henning Diedrich <hd@eonblast.com>
 henopied <13500516+henopied@users.noreply.github.com>
 henridf <henri@dubfer.com>
-henridf <henridf@gmail.com>
 Henry <101552941+henry-0@users.noreply.github.com>
 hero5512 <lvshuaino@gmail.com>
 holisticode <holistic.computing@gmail.com>
@@ -343,7 +338,6 @@ jacksoom <lifengliu1994@gmail.com>
 jackyin <648588267@qq.com>
 Jae Kwon <jkwon.work@gmail.com>
 Jakub Freebit <49676311+jakub-freebit@users.noreply.github.com>
-James Prestwich <10149425+prestwich@users.noreply.github.com>
 James Prestwich <james@prestwi.ch>
 Jamie Pitts <james.pitts@gmail.com>
 Janko Simonovic <simonovic86@gmail.com>
@@ -364,7 +358,6 @@ Jens Agerberg <github@agerberg.me>
 Jens W <8270201+DragonDev1906@users.noreply.github.com>
 Jeremy McNevin <jeremy.mcnevin@optum.com>
 Jeremy Schlatter <jeremy.schlatter@gmail.com>
-Jeremy Schlatter <jeremy@jeremyschlatter.com>
 Jerzy Lasyk <jerzylasyk@gmail.com>
 Jesse Tane <jesse.tane@gmail.com>
 Jia Chenhui <jiachenhui1989@gmail.com>
@@ -409,7 +402,6 @@ Justus <jus@gtsbr.org>
 KAI <35927054+ThreeAndTwo@users.noreply.github.com>
 kaliubuntu0206 <139627505+kaliubuntu0206@users.noreply.github.com>
 Karl Bartel <karl.bartel@clabs.co>
-Karl Bartel <karl@karl.berlin>
 Karol Chojnowski <karolchojnowski95@gmail.com>
 Kawashima <91420903+sscodereth@users.noreply.github.com>
 ken10100147 <sunhongping@kanjian.com>
@@ -461,7 +453,6 @@ Lindlof <mikael@lindlof.io>
 Lio李欧 <lionello@users.noreply.github.com>
 llkhacquan <3724362+llkhacquan@users.noreply.github.com>
 lmittmann <3458786+lmittmann@users.noreply.github.com>
-lmittmann <lmittmann@users.noreply.github.com>
 lorenzo <31852651+lorenzo-dev1@users.noreply.github.com>
 Lorenzo Manacorda <lorenzo@kinvolk.io>
 Louis Holbrook <dev@holbrook.no>
@@ -474,7 +465,6 @@ lzhfromustc <43191155+lzhfromustc@users.noreply.github.com>
 Maciej Kulawik <10907694+magicxyyz@users.noreply.github.com>
 Madhur Shrimal <madhur.shrimal@gmail.com>
 Magicking <s@6120.eu>
-makcandrov <108467407+makcandrov@users.noreply.github.com>
 makcandrov <makcandrov@proton.me>
 manlio <manlio.poltronieri@gmail.com>
 Manoj Kumar <mnjkmr398@gmail.com>
@@ -606,7 +596,6 @@ Paul-Armand Verhaegen <paularmand.verhaegen@gmail.com>
 Paulo L F Casaretto <pcasaretto@gmail.com>
 Pawan Dhananjay <pawandhananjay@gmail.com>
 Paweł Bylica <chfast@gmail.com>
-Paweł Bylica <pawel@ethereum.org>
 Pedro Gomes <otherview@gmail.com>
 Pedro Pombeiro <PombeirP@users.noreply.github.com>
 persmor <166146971+persmor@users.noreply.github.com>
@@ -658,7 +647,6 @@ Rob <robert@rojotek.com>
 Rob Mulholand <rmulholand@8thlight.com>
 Robert Zaremba <robert@zaremba.ch>
 Roberto Bayardo <bayardo@alum.mit.edu>
-Roberto Bayardo <roberto.bayardo@coinbase.com>
 Roc Yu <rociiu0112@gmail.com>
 Roman Krasiuk <rokrassyuk@gmail.com>
 Roman Mazalov <83914728+gopherxyz@users.noreply.github.com>
@@ -688,11 +676,8 @@ Saulius Grigaitis <saulius@necolt.com>
 Sean <darcys22@gmail.com>
 seayyyy <163325936+seay404@users.noreply.github.com>
 Sebastian Stammler <seb@oplabs.co>
-Sebastian Stammler <stammler.s@gmail.com>
 Serhat Şevki Dinçer <jfcgauss@gmail.com>
-Seungbae Yu <72970043+dbadoy@users.noreply.github.com>
 Seungbae Yu <dbadoy4874@gmail.com>
-Seungbae.yu <72970043+dbadoy@users.noreply.github.com>
 Seungmin Kim <a7965344@gmail.com>
 Shane Bammel <sjb933@gmail.com>
 shawn <36943337+lxex@users.noreply.github.com>
@@ -762,7 +747,6 @@ thomasmodeneis <thomas.modeneis@gmail.com>
 thumb8432 <thumb8432@gmail.com>
 Ti Zhou <tizhou1986@gmail.com>
 tia-99 <67107070+tia-99@users.noreply.github.com>
-tianyeyouyou <150894831+tianyeyouyou@users.noreply.github.com>
 tianyeyouyou <tianyeyouyou@gmail.com>
 Tien Nguyen <116023870+htiennv@users.noreply.github.com>
 Tim Cooijmans <timcooijmans@gmail.com>
@@ -780,7 +764,6 @@ Tyler Chambers <2775339+tylerchambers@users.noreply.github.com>
 tylerni7 <tylerni7@gmail.com>
 tzapu <alex@tzapu.com>
 ucwong <ethereum2k@gmail.com>
-ucwong <ucwong@126.com>
 uji <49834542+uji@users.noreply.github.com>
 ult-bobonovski <alex@ultiledger.io>
 Undefinedor <wanghao@imwh.net>
@@ -858,7 +841,6 @@ Yusup <awklsgrep@gmail.com>
 yutianwu <wzxingbupt@gmail.com>
 ywzqwwt <39263032+ywzqwwt@users.noreply.github.com>
 yzb <335357057@qq.com>
-yzb <flyingyzb@gmail.com>
 zaccoding <zaccoding725@gmail.com>
 Zach <zach.ramsay@gmail.com>
 Zachinquarantine <Zachinquarantine@protonmail.com>