Remove unncessary fields