Updated org maintainers

Signed-off-by: Toddy Mladenov <[email protected]>

CODEOWNERS

@@ -1,2 +1,2 @@
 # Repo-Level Owners (in alphabetical order). Please note this is only for the notaryproject/notaryproject.dev repo
-* @FeynmanZhou @niazfk @iamsamirzon @justincormack @priteshbandi @shizhMSFT @stevelasker @toddysm @vaninrao10 @yizha1 @zr-msft
+* @FeynmanZhou @niazfk @iamsamirzon @priteshbandi @shizhMSFT @toddysm @vaninrao10 @yizha1

MAINTAINERS

@@ -1,10 +1,8 @@
 # Org-Level Maintainers (in alphabetical order)
 # Pattern: [First Name] [Last Name] <[Email Address]> ([GitHub Handle])
-Justin Cormack <[email protected]> (@justincormack)
 Niaz Khan <[email protected]> (@niazfk)
 Pritesh Bandi <[email protected]> (@priteshbandi)
 Shiwei Zhang <[email protected]> (@shizhMSFT)
-Steve Lasker <[email protected]> (@stevelasker)
 Toddy Mladenov <[email protected]> (@toddysm)
 
 # Repo-Level Maintainers (in alphabetical order)
@@ -13,4 +11,10 @@ Feynman Zhou <[email protected]> (@FeynmanZhou)
 Samir Kakkar <[email protected]> (@iamsamirzon)
 Vani Rao <[email protected]> (@vaninrao10)
 Yi Zha <[email protected]> (@yizha1)
-Zach Rhoads <[email protected]> (@zr-msft)
+
+# Emeritus Org Maintainers (in alphabetical order)
+Justin Cormack <[email protected]> (@justincormack)
+Steve Lasker <[email protected]> (@stevelasker)
+
+# In memoriam
+Zach Rhoads <[email protected]> (@zr-msft)