Remove defaults for parameters, and remove an extra parameter in method call