Get rid of unnecessary fields