Removed extraneous parameters