Merge "Remove misleading arguments"