[cleanup] Updated some deprecated API calls