Removed more unwanted fields.