LP1803787 (follow-up) removing unnecessary arguments