remove some more unneeded fields