removed unneeded fields