removed unnecessary xml field and options