removed unneeded props