Removed unneeded parameters
Removed unneeded dependencies