Removed unused and superfluous parameters.