Remove some unnecessary arguments