removed unneeded generator params