MAPI-112 clean up code. Outstanding is the other URL not working.