Merge "Remove the unused parameters" into main