Merge "Deleting deprecated function"