diff --git a/SAILPOINT/Functions/ES_REMOVE_MAPICS_USER_FROM_ROLE.sql b/SAILPOINT/Functions/ES_REMOVE_MAPICS_USER_FROM_ROLE.sql
index 6cff38c..d9e7a9e 100644
--- a/SAILPOINT/Functions/ES_REMOVE_MAPICS_USER_FROM_ROLE.sql
+++ b/SAILPOINT/Functions/ES_REMOVE_MAPICS_USER_FROM_ROLE.sql
@@ -1 +1,103 @@
-âÅã@×ÁãÈ@\ÓÉÂÓ@^@
%
%ÃÙÅÁãÅ@ÖÙ@ÙÅ×ÓÁÃÅ@ÆäÕÃãÉÖÕ@âÁÉÓ×ÖÉÕãKÅâmÙÅÔÖåÅmÔÁ×ÉÃâmäâÅÙmÆÙÖÔmÙÖÓÅ@M@
%ÅÕåÉÄ@ÃÈÁÙMò]@k@
%äâÅÙÕÁÔÅ@ÃÈÁÙMñð]@k@
%äâÅÙÙÖÓÅâ@åÁÙÃÈÁÙMñððð]@]@
%ÙÅãäÙÕâ@ÃÓÖÂMòñô÷ôøóöô÷]@@@
%ÓÁÕÇäÁÇÅ@âØÓ@
%â×ÅÃÉÆÉÃ@âÁÉÓ×ÖÉÕãKÅâÄÅÓÔäâÙÙ@
%ÕÖã@ÄÅãÅÙÔÉÕÉâãÉÃ@
%ÔÖÄÉÆÉÅâ@âØÓ@ÄÁãÁ@
%ÃÁÓÓÅÄ@ÖÕ@ÕäÓÓ@ÉÕ×äã@
%ÕÖã@ÆÅÕÃÅÄ@
%âÅã@Ö×ãÉÖÕ@@ÁÓæÂÓÒ@~@\ÁÓÓÙÅÁÄ@k@
%ÁÓæÃ×èÄãÁ@~@\Ö×ãÉÔÉéÅ@k@
%ÃÖÔÔÉã@~@\ÕÖÕÅ@k@
%ÄÅÃÙÅâäÓã@~@Móñk@óñk@ðð]@k@
%ÄèÕÄÆãÃÖÓ@~@\ÕÖ@k@
%ÄèÕäâÙ×ÙÆ@~@\äâÅÙ@k@
%âÙãâÅØ@~@\ÈÅç@@@
%ÂÅÇÉÕ@
%ÄÅÃÓÁÙÅ@ÓÉÂÓ@åÁÙÃÈÁÙ@M@ñðòô@]@ÄÅÆÁäÓã@}}@^@
%ÄÅÃÓÁÙÅ@ÃäÙmäâÙ@åÁÙÃÈÁÙ@M@ñð@]@ÄÅÆÁäÓã@}}@^@
%ÄÅÃÓÁÙÅ@ÃÖÕãÉÕäÅ@ÈÁÕÄÓÅÙ@ÆÖÙ@âØÓÅçÃÅ×ãÉÖÕ@
%ÂÅÇÉÕ@
%ÄÅÃÓÁÙÅ@åmâØÓâãÁãÅ@ÃÈÁÙ@M@õ@]@^@
%ÄÅÃÓÁÙÅ@åmÄÂòmÙÅãäÙÕmÃÖÄÅ@ÉÕã@^@
%ÄÅÃÓÁÙÅ@åmÄÂòmÔÅââÁÇÅmÉÄ@ÃÈÁÙ@M@÷@]@^@
%ÄÅÃÓÁÙÅ@åmÅÙÙÖÙmÔÅââÁÇÅ@ÃÓÖÂ@M@òðôø@]@^@
%``@Ã�—£¤™…@„‰�‡•–¢£‰ƒ@‰•†–@
%ÇÅã@ÄÉÁÇÕÖâãÉÃâ@ÃÖÕÄÉãÉÖÕ@ñ@
%åmÄÂòmÙÅãäÙÕmÃÖÄÅ@~@ÄÂòmÙÅãäÙÕÅÄmâØÓÃÖÄÅ@k@
%åmâØÓâãÁãÅ@~@ÙÅãäÙÕÅÄmâØÓâãÁãÅ@k@
%åmÅÙÙÖÙmÔÅââÁÇÅ@~@ÔÅââÁÇÅmãÅçã@k@
%åmÄÂòmÔÅââÁÇÅmÉÄ@~@ÄÂòmÔÅââÁÇÅmÉÄ@^@
%ÙÅãäÙÕ@
%M@ÑâÖÕmÖÂÑÅÃã@M@
%}¢¤ƒƒ…¢¢}@åÁÓäÅ@}†�“¢…}@k@}âØÓÉ•†–}@åÁÓäÅ@ÑâÖÕmÖÂÑÅÃã@M@
%}âØÓâ£�£…}@åÁÓäÅ@åmâØÓâãÁãÅ@k@
%}âØÓÃ–„…}@åÁÓäÅ@åmÄÂòmÙÅãäÙÕmÃÖÄÅ@k@
%}”…¢¢�‡…ÉÄ}@åÁÓäÅ@åmÄÂòmÔÅââÁÇÅmÉÄ@k@
%}”…¢¢�‡…}@åÁÓäÅ@åmÅÙÙÖÙmÔÅââÁÇÅ@k@
%}ƒ¤™™…•£ã‰”…¢£�”—}@åÁÓäÅ@ÃäÙÙÅÕãmãÉÔÅâãÁÔ×@
%]@
%]@]@^@
%ÅÕÄ@^@
%âÅã@ÃÉâãÖÖÓâ@K@ÓÉÂÓ@~@ÃÉâãÖÖÓâ@K@âÅãmÓÉÂÙÁÙèmÓÉâã@M@ÅÕåÉÄ@]@^@
%âÅã@ÃäÙmäâÙ@~@ÃäÙÙÅÕãmäâÅÙ@^@
%ÆÖÙ@âÅÓÅÃã@ÆÙÁÇÔÅÕã@
%ÆÙÖÔ@ãÁÂÓÅ@M@
%ÃÉâãÖÖÓâ@K@â×ÓÉãmâãÙÉÕÇ@M@
%ÙÅÇÅç×mÙÅ×ÓÁÃÅ@M@
%ÃÁâã@M@äâÅÙÙÖÓÅâ@Áâ@åÁÙÃÈÁÙ@M@ñððð@]@ÃÃâÉÄ@ó÷@]@k@
%}ºàºOà»OàÀOàÐOàOàkOà¢N»}@k@}k}@]@k@}k}@]@
%]@
%æÈÅÙÅ@ÆÙÁÇÔÅÕã@Ln@}}@
%ÁÕÄ@ÆÙÁÇÔÅÕã@Éâ@ÕÖã@ÕäÓÓ@
%ÄÖ@
%ÃÁÓÓ@âÁÉÓ×ÖÉÕã@K@ÙÅÔÖåÅmÅâmäâÅÙmÆÙÖÔmÙÖÓÅ@M@ÅÕåÉÄ@k@äâÅÙÕÁÔÅ@k@
%ÆÙÁÇÔÅÕã@]@^@
%ÅÕÄ@ÆÖÙ@^@
%ÙÅãäÙÕ@
%ÃÖÁÓÅâÃÅ@M@
%ÑâÖÕmÖÂÑÅÃã@M@
%}¢¤ƒƒ…¢¢}@åÁÓäÅ@}£™¤…}@k@}„�£�}@åÁÓäÅ@M@
%âÅÓÅÃã@
%ÑâÖÕmÁÙÙÁèÁÇÇ@M@
%ÑâÖÕmÖÂÑÅÃã@M@
%}¤¢…™É„}@åÁÓäÅ@ÙãÙÉÔ@M@
%ÃÁâã@M@ÅääâÅÙ@Áâ@åÁÙÃÈÁÙ@M@ñð@]@ÃÃâÉÄ@ó÷@]@]@k@
%}™–“…¢}@åÁÓäÅ@ÙÖÓÅâÑâÖÕ@ÆÖÙÔÁã@ÑâÖÕ@
%]@ÆÖÙÔÁã@ÑâÖÕ@
%]@Áâ@ÆÉÕÁÓÑâÖÕ@
%ÆÙÖÔ@ãÁÂÓÅ@M@
%âÅÓÅÃã@ÅääâÅÙ@k@
%ÑâÖÕmÖÂÑÅÃãÁÇÇ@M@ÙãÙÉÔ@M@
%ÃÁâã@M@ÅäÙÖÓÅ@Áâ@åÁÙÃÈÁÙ@M@ñð@]@ÃÃâÉÄ@ó÷@]@]@
%åÁÓäÅ@ÙãÙÉÔ@M@
%ÃÁâã@M@ÅäÄÅâÃ@Áâ@åÁÙÃÈÁÙ@M@õð@]@ÃÃâÉÄ@ó÷@]@]@
%ÆÖÙÔÁã@ÑâÖÕ@]@Áâ@ÙÖÓÅâÑâÖÕ@
%ÆÙÖÔ@ÅâäâÙ×@
%ÑÖÉÕ@ÅâÙÖÓ×@
%äâÉÕÇ@M@ÅäÙÖÓÅ@]@
%æÈÅÙÅ@ÅääâÅÙ@~@äâÅÙÕÁÔÅ@
%ÇÙÖä×@Âè@ÅääâÅÙ@
%]@]@ÆÖÙÔÁã@ÑâÖÕ@
%]@k@ÑâÖÕmÖÂÑÅÃã@M@
%}¢¤ƒƒ…¢¢}@åÁÓäÅ@}†�“¢…}@k@}âØÓÉ•†–}@åÁÓäÅ@ÑâÖÕmÖÂÑÅÃã@M@
%}”…¢¢�‡…ÉÄ}@åÁÓäÅ@}âØÓðòððð}@k@
%}”…¢¢�‡…}@åÁÓäÅ@}Ù…˜¤…¢£…„@™…¢–¤™ƒ…@•–£@†–¤•„@}@k@
%}ƒ¤™™…•£ã‰”…¢£�”—}@z@ÃäÙÙÅÕãmãÉÔÅâãÁÔ×@
%]@
%]@]@^@
%ÅÕÄ@@^@
%
%ÇÙÁÕã@ÁÓãÅÙ@k@ÅçÅÃäãÅ@@@
%ÖÕ@â×ÅÃÉÆÉÃ@ÆäÕÃãÉÖÕ@âÁÉÓ×ÖÉÕãKÅâÄÅÓÔäâÙÙ@
%ãÖ@ÁÔÁ×ÉÃâ@æÉãÈ@ÇÙÁÕã@Ö×ãÉÖÕ@^@
%
%ÇÙÁÕã@ÅçÅÃäãÅ@@@
%ÖÕ@â×ÅÃÉÆÉÃ@ÆäÕÃãÉÖÕ@âÁÉÓ×ÖÉÕãKÅâÄÅÓÔäâÙÙ@
%ãÖ@×äÂÓÉÃ@^@
%
%
\ No newline at end of file
+SET PATH *LIBL ; 
+
+CREATE OR REPLACE FUNCTION SAILPOINT.ES_REMOVE_MAPICS_USER_FROM_ROLE ( 
+	ENVID CHAR(2) , 
+	USERNAME CHAR(10) , 
+	USERROLES VARCHAR(1000) ) 
+	RETURNS CLOB(2147483647)   
+	LANGUAGE SQL 
+	SPECIFIC SAILPOINT.ESDELMUSRR 
+	NOT DETERMINISTIC 
+	MODIFIES SQL DATA 
+	CALLED ON NULL INPUT 
+	NOT FENCED 
+	SET OPTION  ALWBLK = *ALLREAD , 
+	ALWCPYDTA = *OPTIMIZE , 
+	COMMIT = *NONE , 
+	DECRESULT = (31, 31, 00) , 
+	DYNDFTCOL = *NO , 
+	DYNUSRPRF = *USER , 
+	SRTSEQ = *HEX   
+	BEGIN 
+DECLARE LIBL VARCHAR ( 1024 ) DEFAULT '' ; 
+DECLARE CUR_USR VARCHAR ( 10 ) DEFAULT '' ; 
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION 
+BEGIN 
+DECLARE V_SQLSTATE CHAR ( 5 ) ; 
+DECLARE V_DB2_RETURN_CODE INT ; 
+DECLARE V_DB2_MESSAGE_ID CHAR ( 7 ) ; 
+DECLARE V_ERROR_MESSAGE CLOB ( 2048 ) ; 
+-- Capture diagnostic info 
+GET DIAGNOSTICS CONDITION 1 
+V_DB2_RETURN_CODE = DB2_RETURNED_SQLCODE , 
+V_SQLSTATE = RETURNED_SQLSTATE , 
+V_ERROR_MESSAGE = MESSAGE_TEXT , 
+V_DB2_MESSAGE_ID = DB2_MESSAGE_ID ; 
+RETURN 
+( JSON_OBJECT ( 
+'success' VALUE 'false' , 'SQLInfo' VALUE JSON_OBJECT ( 
+'SQLState' VALUE V_SQLSTATE , 
+'SQLCode' VALUE V_DB2_RETURN_CODE , 
+'messageID' VALUE V_DB2_MESSAGE_ID , 
+'message' VALUE V_ERROR_MESSAGE , 
+'currentTimestamp' VALUE CURRENT_TIMESTAMP 
+) 
+) ) ; 
+END ; 
+SET CISTOOLS . LIBL = CISTOOLS . SET_LIBRARY_LIST ( ENVID ) ; 
+SET CUR_USR = CURRENT_USER ; 
+FOR SELECT FRAGMENT 
+FROM TABLE ( 
+CISTOOLS . SPLIT_STRING ( 
+REGEXP_REPLACE ( 
+CAST ( USERROLES AS VARCHAR ( 1000 ) CCSID 37 ) , 
+'[\[|\]|\{|\}|\"|\,|\s+]' , ',' ) , ',' ) 
+) 
+WHERE FRAGMENT <> '' 
+AND FRAGMENT IS NOT NULL 
+DO 
+CALL SAILPOINT . REMOVE_ES_USER_FROM_ROLE ( ENVID , USERNAME , 
+FRAGMENT ) ; 
+END FOR ; 
+RETURN 
+COALESCE ( 
+JSON_OBJECT ( 
+'success' VALUE 'true' , 'data' VALUE ( 
+SELECT 
+JSON_ARRAYAGG ( 
+JSON_OBJECT ( 
+'userId' VALUE RTRIM ( 
+CAST ( EUUSER AS VARCHAR ( 10 ) CCSID 37 ) ) , 
+'roles' VALUE ROLESJSON FORMAT JSON 
+) FORMAT JSON 
+) AS FINALJSON 
+FROM TABLE ( 
+SELECT EUUSER , 
+JSON_OBJECTAGG ( RTRIM ( 
+CAST ( EUROLE AS VARCHAR ( 10 ) CCSID 37 ) ) 
+VALUE RTRIM ( 
+CAST ( EUDESC AS VARCHAR ( 50 ) CCSID 37 ) ) 
+FORMAT JSON ) AS ROLESJSON 
+FROM ESUSRP 
+JOIN ESROLP 
+USING ( EUROLE ) 
+WHERE EUUSER = USERNAME 
+GROUP BY EUUSER 
+) ) FORMAT JSON 
+) , JSON_OBJECT ( 
+'success' VALUE 'false' , 'SQLInfo' VALUE JSON_OBJECT ( 
+'messageID' VALUE 'SQL02000' , 
+'message' VALUE 'Requested resource not found ' , 
+'currentTimestamp' : CURRENT_TIMESTAMP 
+) 
+) ) ; 
+END  ; 
+
+GRANT ALTER , EXECUTE   
+ON SPECIFIC FUNCTION SAILPOINT.ESDELMUSRR 
+TO AMAPICS WITH GRANT OPTION ; 
+
+GRANT EXECUTE   
+ON SPECIFIC FUNCTION SAILPOINT.ESDELMUSRR 
+TO PUBLIC ; 
+
