Remove unused variables.
Adjust parameters.