Removing unneeded fields