Removed deprecated function uses.