Remove passing of arguments