Removed use of deprecated calls