Remove more user of deprecated function