Removed some fields from analysis options