Removed usages of deprecated function