Deleted unneeded fields