Removed some uneeded function arguments