Merge "Remove unused parameter"