Remove some unnecessary fields