removed some more unnecessary arguments