removed unneccssary fields