Removed un-needed fields and upper save buttons RFI_New