remove unneeded fields