Remove some more unneeded fields