Remove some of unnecessary arguments