Merge "Removing unused "ishp" arguments."