Removed unneeded fields