Removed unneeded paramters