Got rid of unnecessary fields