Removed extraneous function parameters