Remove unused (and confusing) arguments