Merge "Remove unused arguments"