Remove unneeded fields