Removed unneccary fields