removing unnecessary fields