diff --git a/.mailmap b/.mailmap
index 808fc22..e9efe6a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,9 +1,7 @@
 Sam Hatchett <samhatchett@gmail.com>
 James Uber <jim@citilogics.com>
 Demetrios Eliades <eldemet@gmail.com>
-Hyoungmin Woo <hyoungmin.woo@gmail.com>
-Hyoungmin Woo <hyoungmin.woo@gmail.com> <woohn@mail.uc.edu>
+Hyoungmin Woo <hyoungmin.woo@gmail.com> Mickey <hyoungmin.woo@gmail.com>
+Hyoungmin Woo <hyoungmin.woo@gmail.com> Hyoungmin Woo <woohn@mail.uc.edu>
 Yunier Soad <yunier.soad@gmail.com>
-Jinduan Chen <jinduan.uc@gmail.com>
-Maurizio Cingi <mrzcng2@gmail.com>
-Elad Salomons <selad@optiwater.com> <elad.salomons@gmail.com>
\ No newline at end of file
+Jinduan Chen <jinduan.uc@gmail.com>
\ No newline at end of file
diff --git a/AUTHORS b/AUTHORS
index b12a354..df0b6bf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,5 +16,3 @@ Will Furnass <will@thearete.co.uk>
 Steffen Macke <sdteffen@sdteffen.de>
 Mariosmsk <mariosmsk@gmail.com>
 Elad Salomons <selad@optiwater.com>
-Maurizio Cingi <mrzcng2@gmail.com>
-Bryant McDonnell <bemcdonnell@gmail.com>