Remove use of deprecated api calls
Remove use of deprecated api calls