Removed unneeded parameters