Merge pull request #6699 from vespa-engine/balder/remove-unneeded-empty-brackets

Remove empty array brackets. Not used for a very long time.

11 files changed, 0 insertions, 360 deletions

diff --git a/config-model/src/test/derived/deriver/ilscripts.cfg b/config-model/src/test/derived/deriver/ilscripts.cfg
index 8ce9e496ac6..819ab51fcef 100644
--- a/config-model/src/test/derived/deriver/ilscripts.cfg
+++ b/config-model/src/test/derived/deriver/ilscripts.cfg
@@ -1,7 +1,5 @@
-ilscript[]
 ilscript[child].name "child"
 ilscript[child].doctype "child"
-ilscript[child].content[]
 ilscript[child].content[] "\"child\" | index sddocname | summary sddocname"
 ilscript[child].content[] "input c | tokenize normalize stem:\"SHORTEST\" | index c"
 ilscript[child].content[] "input b | tokenize normalize stem:\"SHORTEST\" | index b | summary b"
diff --git a/config-model/src/test/derived/documentderiver/vsmfields.cfg b/config-model/src/test/derived/documentderiver/vsmfields.cfg
index 3c969775f5b..cd8bc659398 100644
--- a/config-model/src/test/derived/documentderiver/vsmfields.cfg
+++ b/config-model/src/test/derived/documentderiver/vsmfields.cfg
@@ -1,4 +1,3 @@
-fieldspec[]
 fieldspec[].name sddocname
 fieldspec[].searchmethod AUTOUTF8
 fieldspec[].arg1 "exact"
@@ -173,260 +172,180 @@ fieldspec[].arg1 "prefix"
 fieldspec[].name attachmentcontent
 fieldspec[].searchmethod AUTOUTF8
 fieldspec[].arg1 "prefix"
-documenttype[]
 documenttype[].name newssummary
-documenttype[].index[]
 documenttype[].index[].name sddocname
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sddocname
 documenttype[].index[].name title
-documenttype[].index[].field[]
 documenttype[].index[].field[].name title
 documenttype[].index[].name titleabstract
-documenttype[].index[].field[]
 documenttype[].index[].field[].name title
 documenttype[].index[].field[].name abstract
 documenttype[].index[].name default
-documenttype[].index[].field[]
 documenttype[].index[].field[].name title
 documenttype[].index[].field[].name abstract
 documenttype[].index[].name abstract
-documenttype[].index[].field[]
 documenttype[].index[].field[].name abstract
 documenttype[].index[].name sourcename
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcename
 documenttype[].index[].name source
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcename
 documenttype[].index[].field[].name providername
 documenttype[].index[].name providername
-documenttype[].index[].field[]
 documenttype[].index[].field[].name providername
 documenttype[].index[].name thumburl
-documenttype[].index[].field[]
 documenttype[].index[].field[].name thumburl
 documenttype[].index[].name thumbwidth
-documenttype[].index[].field[]
 documenttype[].index[].field[].name thumbwidth
 documenttype[].index[].name thumbheight
-documenttype[].index[].field[]
 documenttype[].index[].field[].name thumbheight
 documenttype[].index[].name language
-documenttype[].index[].field[]
 documenttype[].index[].field[].name language
 documenttype[].index[].name languages
-documenttype[].index[].field[]
 documenttype[].index[].field[].name language
 documenttype[].index[].name url
-documenttype[].index[].field[]
 documenttype[].index[].field[].name url
 documenttype[].index[].name sourceurl
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourceurl
 documenttype[].index[].name categories
-documenttype[].index[].field[]
 documenttype[].index[].field[].name categories
 documenttype[].index[].name pubdate
-documenttype[].index[].field[]
 documenttype[].index[].field[].name pubdate
 documenttype[].index[].name expdate
-documenttype[].index[].field[]
 documenttype[].index[].field[].name expdate
 documenttype[].index[].name fingerprint
-documenttype[].index[].field[]
 documenttype[].index[].field[].name fingerprint
 documenttype[].index[].name debug
-documenttype[].index[].field[]
 documenttype[].index[].field[].name debug
 documenttype[].index[].name attributes
-documenttype[].index[].field[]
 documenttype[].index[].field[].name attributes
 documenttype[].index[].name eustaticrank
-documenttype[].index[].field[]
 documenttype[].index[].field[].name eustaticrank
 documenttype[].index[].name usstaticrank
-documenttype[].index[].field[]
 documenttype[].index[].field[].name usstaticrank
 documenttype[].index[].name asiastaticrank
-documenttype[].index[].field[]
 documenttype[].index[].field[].name asiastaticrank
 documenttype[].name newsarticle
-documenttype[].index[]
 documenttype[].index[].name sddocname
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sddocname
 documenttype[].index[].name title
-documenttype[].index[].field[]
 documenttype[].index[].field[].name title
 documenttype[].index[].name titleabstract
-documenttype[].index[].field[]
 documenttype[].index[].field[].name title
 documenttype[].index[].field[].name abstract
 documenttype[].index[].name default
-documenttype[].index[].field[]
 documenttype[].index[].field[].name title
 documenttype[].index[].field[].name abstract
 documenttype[].index[].field[].name body
 documenttype[].index[].name abstract
-documenttype[].index[].field[]
 documenttype[].index[].field[].name abstract
 documenttype[].index[].name sourcename
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcename
 documenttype[].index[].name source
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcename
 documenttype[].index[].field[].name providername
 documenttype[].index[].field[].name othersourcenames
 documenttype[].index[].name providername
-documenttype[].index[].field[]
 documenttype[].index[].field[].name providername
 documenttype[].index[].name thumburl
-documenttype[].index[].field[]
 documenttype[].index[].field[].name thumburl
 documenttype[].index[].name thumbwidth
-documenttype[].index[].field[]
 documenttype[].index[].field[].name thumbwidth
 documenttype[].index[].name thumbheight
-documenttype[].index[].field[]
 documenttype[].index[].field[].name thumbheight
 documenttype[].index[].name language
-documenttype[].index[].field[]
 documenttype[].index[].field[].name language
 documenttype[].index[].name languages
-documenttype[].index[].field[]
 documenttype[].index[].field[].name language
 documenttype[].index[].field[].name otherlanguages
 documenttype[].index[].name url
-documenttype[].index[].field[]
 documenttype[].index[].field[].name url
 documenttype[].index[].name sourceurl
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourceurl
 documenttype[].index[].name categories
-documenttype[].index[].field[]
 documenttype[].index[].field[].name categories
 documenttype[].index[].name pubdate
-documenttype[].index[].field[]
 documenttype[].index[].field[].name pubdate
 documenttype[].index[].name expdate
-documenttype[].index[].field[]
 documenttype[].index[].field[].name expdate
 documenttype[].index[].name fingerprint
-documenttype[].index[].field[]
 documenttype[].index[].field[].name fingerprint
 documenttype[].index[].name debug
-documenttype[].index[].field[]
 documenttype[].index[].field[].name debug
 documenttype[].index[].name attributes
-documenttype[].index[].field[]
 documenttype[].index[].field[].name attributes
 documenttype[].index[].name eustaticrank
-documenttype[].index[].field[]
 documenttype[].index[].field[].name eustaticrank
 documenttype[].index[].name usstaticrank
-documenttype[].index[].field[]
 documenttype[].index[].field[].name usstaticrank
 documenttype[].index[].name asiastaticrank
-documenttype[].index[].field[]
 documenttype[].index[].field[].name asiastaticrank
 documenttype[].index[].name body
-documenttype[].index[].field[]
 documenttype[].index[].field[].name body
 documenttype[].index[].name othersourcenames
-documenttype[].index[].field[]
 documenttype[].index[].field[].name othersourcenames
 documenttype[].index[].name author
-documenttype[].index[].field[]
 documenttype[].index[].field[].name author
 documenttype[].index[].name referrerurl
-documenttype[].index[].field[]
 documenttype[].index[].field[].name referrerurl
 documenttype[].index[].name sourcelocation
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcelocation
 documenttype[].index[].field[].name sourcecountry
 documenttype[].index[].field[].name sourcelocale
 documenttype[].index[].field[].name sourcecontinent
 documenttype[].index[].name sourcecountry
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcecountry
 documenttype[].index[].name sourcelocale
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcelocale
 documenttype[].index[].name sourcecontinent
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcecontinent
 documenttype[].index[].name articlecountry
-documenttype[].index[].field[]
 documenttype[].index[].field[].name articlecountry
 documenttype[].index[].name articlelocale
-documenttype[].index[].field[]
 documenttype[].index[].field[].name articlelocale
 documenttype[].index[].name articlecontinent
-documenttype[].index[].field[]
 documenttype[].index[].field[].name articlecontinent
 documenttype[].index[].name sourcerank
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcerank
 documenttype[].index[].name crawldate
-documenttype[].index[].field[]
 documenttype[].index[].field[].name crawldate
 documenttype[].index[].name indexdate
-documenttype[].index[].field[]
 documenttype[].index[].field[].name indexdate
 documenttype[].index[].name procdate
-documenttype[].index[].field[]
 documenttype[].index[].field[].name procdate
 documenttype[].index[].name sourceid
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourceid
 documenttype[].index[].name sourcefeedid
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sourcefeedid
 documenttype[].name music
-documenttype[].index[]
 documenttype[].index[].name sddocname
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sddocname
 documenttype[].name mail
-documenttype[].index[]
 documenttype[].index[].name sddocname
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sddocname
 documenttype[].index[].name mailid
-documenttype[].index[].field[]
 documenttype[].index[].field[].name mailid
 documenttype[].index[].name date
-documenttype[].index[].field[]
 documenttype[].index[].field[].name date
 documenttype[].index[].name from
-documenttype[].index[].field[]
 documenttype[].index[].field[].name from
 documenttype[].index[].name sender
-documenttype[].index[].field[]
 documenttype[].index[].field[].name from
 documenttype[].index[].name address
-documenttype[].index[].field[]
 documenttype[].index[].field[].name from
 documenttype[].index[].field[].name to
 documenttype[].index[].field[].name cc
 documenttype[].index[].name header
-documenttype[].index[].field[]
 documenttype[].index[].field[].name from
 documenttype[].index[].field[].name to
 documenttype[].index[].field[].name cc
 documenttype[].index[].field[].name subject
 documenttype[].index[].name default
-documenttype[].index[].field[]
 documenttype[].index[].field[].name from
 documenttype[].index[].field[].name to
 documenttype[].index[].field[].name cc
 documenttype[].index[].field[].name subject
 documenttype[].index[].field[].name mailbody
 documenttype[].index[].name all
-documenttype[].index[].field[]
 documenttype[].index[].field[].name from
 documenttype[].index[].field[].name to
 documenttype[].index[].field[].name cc
@@ -436,54 +355,36 @@ documenttype[].index[].field[].name attachmentnames
 documenttype[].index[].field[].name attachmenttypes
 documenttype[].index[].field[].name attachmentcontent
 documenttype[].index[].name replyto
-documenttype[].index[].field[]
 documenttype[].index[].field[].name replyto
 documenttype[].index[].name to
-documenttype[].index[].field[]
 documenttype[].index[].field[].name to
 documenttype[].index[].name recipient
-documenttype[].index[].field[]
 documenttype[].index[].field[].name to
 documenttype[].index[].field[].name cc
 documenttype[].index[].name cc
-documenttype[].index[].field[]
 documenttype[].index[].field[].name cc
 documenttype[].index[].name bcc
-documenttype[].index[].field[]
 documenttype[].index[].field[].name bcc
 documenttype[].index[].name subject
-documenttype[].index[].field[]
 documenttype[].index[].field[].name subject
 documenttype[].index[].name mailbody
-documenttype[].index[].field[]
 documenttype[].index[].field[].name mailbody
 documenttype[].index[].name attachmentcount
-documenttype[].index[].field[]
 documenttype[].index[].field[].name attachmentcount
 documenttype[].index[].name attachmentname
-documenttype[].index[].field[]
 documenttype[].index[].field[].name attachmentnames
 documenttype[].index[].name attachmenttype
-documenttype[].index[].field[]
 documenttype[].index[].field[].name attachmenttypes
 documenttype[].index[].name attachmentlanguages
-documenttype[].index[].field[]
 documenttype[].index[].field[].name attachmentlanguages
 documenttype[].index[].name attachment
-documenttype[].index[].field[]
 documenttype[].index[].field[].name attachmentcontent
 documenttype[].name compressed_header
-documenttype[].index[]
 documenttype[].index[].name sddocname
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sddocname
 documenttype[].name compressed_both
-documenttype[].index[]
 documenttype[].index[].name sddocname
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sddocname
 documenttype[].name compressed_body
-documenttype[].index[]
 documenttype[].index[].name sddocname
-documenttype[].index[].field[]
 documenttype[].index[].field[].name sddocname
diff --git a/config-model/src/test/derived/documentderiver/vsmsummary.cfg b/config-model/src/test/derived/documentderiver/vsmsummary.cfg
index 8469c2b39e2..03513244430 100644
--- a/config-model/src/test/derived/documentderiver/vsmsummary.cfg
+++ b/config-model/src/test/derived/documentderiver/vsmsummary.cfg
@@ -1,6 +1,4 @@
-fieldmap[]
 fieldmap[].summary snippet
-fieldmap[].document[]
 fieldmap[].document[].field body
 fieldmap[].document[].field attachmentcontent
 fieldmap[].command FLATTENJUNIPER
diff --git a/config-model/src/test/derived/fieldlength/attributes.cfg b/config-model/src/test/derived/fieldlength/attributes.cfg
index 6b489a93a50..136fb14eda9 100644
--- a/config-model/src/test/derived/fieldlength/attributes.cfg
+++ b/config-model/src/test/derived/fieldlength/attributes.cfg
@@ -1,4 +1,3 @@
-attribute[]
 attribute[].name "year"
 attribute[].datatype INT32
 attribute[].collectiontype SINGLE
diff --git a/config-model/src/test/derived/inheritance/mother/documentmanager.cfg b/config-model/src/test/derived/inheritance/mother/documentmanager.cfg
index 287fb84885d..7ecd9be403c 100644
--- a/config-model/src/test/derived/inheritance/mother/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritance/mother/documentmanager.cfg
@@ -1,426 +1,191 @@
 enablecompression false
-annotationtype[]
-datatype[]
 datatype[-126593034].id -126593034
-datatype[-126593034].annotationreftype[]
-datatype[-126593034].arraytype[]
-datatype[-126593034].documenttype[]
-datatype[-126593034].structtype[]
 datatype[-126593034].structtype[single].name "child.body"
 datatype[-126593034].structtype[single].version 0
-datatype[-126593034].structtype[single].field[]
-datatype[-126593034].structtype[single].inherits[]
-datatype[-126593034].weightedsettype[]
 datatype[-141935690].id -141935690
-datatype[-141935690].annotationreftype[]
-datatype[-141935690].arraytype[]
-datatype[-141935690].documenttype[]
-datatype[-141935690].structtype[]
 datatype[-141935690].structtype[single].name "search_smartsummary"
 datatype[-141935690].structtype[single].version 0
-datatype[-141935690].structtype[single].field[]
 datatype[-141935690].structtype[single].field[abstract].datatype 2
 datatype[-141935690].structtype[single].field[abstract].name "abstract"
-datatype[-141935690].structtype[single].field[abstract].id[]
 datatype[-141935690].structtype[single].field[dispurl].datatype 2
 datatype[-141935690].structtype[single].field[dispurl].name "dispurl"
-datatype[-141935690].structtype[single].field[dispurl].id[]
 datatype[-141935690].structtype[single].field[title].datatype 2
 datatype[-141935690].structtype[single].field[title].name "title"
-datatype[-141935690].structtype[single].field[title].id[]
-datatype[-141935690].structtype[single].inherits[]
-datatype[-141935690].weightedsettype[]
 datatype[-1467672569].id -1467672569
-datatype[-1467672569].annotationreftype[]
-datatype[-1467672569].arraytype[]
-datatype[-1467672569].documenttype[]
-datatype[-1467672569].structtype[]
 datatype[-1467672569].structtype[single].name "child_search.body"
 datatype[-1467672569].structtype[single].version 0
-datatype[-1467672569].structtype[single].field[]
-datatype[-1467672569].structtype[single].inherits[]
-datatype[-1467672569].weightedsettype[]
 datatype[-154107656].id -154107656
-datatype[-154107656].annotationreftype[]
-datatype[-154107656].arraytype[]
-datatype[-154107656].documenttype[]
 datatype[-154107656].documenttype[single].bodystruct 978262812
 datatype[-154107656].documenttype[single].headerstruct 990971719
 datatype[-154107656].documenttype[single].name "grandparent"
 datatype[-154107656].documenttype[single].version 0
-datatype[-154107656].documenttype[single].inherits[]
-datatype[-154107656].structtype[]
-datatype[-154107656].weightedsettype[]
 datatype[-158393403].id -158393403
-datatype[-158393403].annotationreftype[]
-datatype[-158393403].arraytype[]
-datatype[-158393403].documenttype[]
 datatype[-158393403].documenttype[single].bodystruct -1989003153
 datatype[-158393403].documenttype[single].headerstruct 1306663898
 datatype[-158393403].documenttype[single].name "mother"
 datatype[-158393403].documenttype[single].version 0
-datatype[-158393403].documenttype[single].inherits[]
 datatype[-158393403].documenttype[single].inherits[grandparent].name "grandparent"
 datatype[-158393403].documenttype[single].inherits[grandparent].version 0
-datatype[-158393403].structtype[]
-datatype[-158393403].weightedsettype[]
 datatype[-1740240543].id -1740240543
-datatype[-1740240543].annotationreftype[]
-datatype[-1740240543].arraytype[]
-datatype[-1740240543].documenttype[]
-datatype[-1740240543].structtype[]
 datatype[-1740240543].structtype[single].name "search_feature"
 datatype[-1740240543].structtype[single].version 0
-datatype[-1740240543].structtype[single].field[]
 datatype[-1740240543].structtype[single].field[name].datatype 2
 datatype[-1740240543].structtype[single].field[name].name "name"
-datatype[-1740240543].structtype[single].field[name].id[]
 datatype[-1740240543].structtype[single].field[value].datatype 5
 datatype[-1740240543].structtype[single].field[value].name "value"
-datatype[-1740240543].structtype[single].field[value].id[]
-datatype[-1740240543].structtype[single].inherits[]
-datatype[-1740240543].weightedsettype[]
 datatype[-1742340170].id -1742340170
-datatype[-1742340170].annotationreftype[]
-datatype[-1742340170].arraytype[]
-datatype[-1742340170].documenttype[]
-datatype[-1742340170].structtype[]
 datatype[-1742340170].structtype[single].name "father.body"
 datatype[-1742340170].structtype[single].version 0
-datatype[-1742340170].structtype[single].field[]
-datatype[-1742340170].structtype[single].inherits[]
-datatype[-1742340170].weightedsettype[]
 datatype[-1852215954].id -1852215954
-datatype[-1852215954].annotationreftype[]
-datatype[-1852215954].arraytype[]
-datatype[-1852215954].documenttype[]
-datatype[-1852215954].structtype[]
 datatype[-1852215954].structtype[single].name "mother_search.body"
 datatype[-1852215954].structtype[single].version 0
-datatype[-1852215954].structtype[single].field[]
-datatype[-1852215954].structtype[single].inherits[]
-datatype[-1852215954].weightedsettype[]
 datatype[-1962244686].id -1962244686
-datatype[-1962244686].annotationreftype[]
-datatype[-1962244686].arraytype[]
-datatype[-1962244686].documenttype[]
-datatype[-1962244686].structtype[]
 datatype[-1962244686].structtype[single].name "father_search.header"
 datatype[-1962244686].structtype[single].version 0
-datatype[-1962244686].structtype[single].field[]
 datatype[-1962244686].structtype[single].field[onlyfather].datatype 2
 datatype[-1962244686].structtype[single].field[onlyfather].name "onlyfather"
-datatype[-1962244686].structtype[single].field[onlyfather].id[]
 datatype[-1962244686].structtype[single].field[onlygrandparent].datatype 0
 datatype[-1962244686].structtype[single].field[onlygrandparent].name "onlygrandparent"
-datatype[-1962244686].structtype[single].field[onlygrandparent].id[]
 datatype[-1962244686].structtype[single].field[overridden].datatype 0
 datatype[-1962244686].structtype[single].field[overridden].name "overridden"
-datatype[-1962244686].structtype[single].field[overridden].id[]
 datatype[-1962244686].structtype[single].field[rankfeatures].datatype 147991900
 datatype[-1962244686].structtype[single].field[rankfeatures].name "rankfeatures"
-datatype[-1962244686].structtype[single].field[rankfeatures].id[]
 datatype[-1962244686].structtype[single].field[summaryfeatures].datatype 147991900
 datatype[-1962244686].structtype[single].field[summaryfeatures].name "summaryfeatures"
-datatype[-1962244686].structtype[single].field[summaryfeatures].id[]
-datatype[-1962244686].structtype[single].inherits[]
-datatype[-1962244686].weightedsettype[]
 datatype[-1989003153].id -1989003153
-datatype[-1989003153].annotationreftype[]
-datatype[-1989003153].arraytype[]
-datatype[-1989003153].documenttype[]
-datatype[-1989003153].structtype[]
 datatype[-1989003153].structtype[single].name "mother.body"
 datatype[-1989003153].structtype[single].version 0
-datatype[-1989003153].structtype[single].field[]
-datatype[-1989003153].structtype[single].inherits[]
-datatype[-1989003153].weightedsettype[]
 datatype[-205818510].id -205818510
-datatype[-205818510].annotationreftype[]
-datatype[-205818510].arraytype[]
-datatype[-205818510].documenttype[]
-datatype[-205818510].structtype[]
 datatype[-205818510].structtype[single].name "child_search.header"
 datatype[-205818510].structtype[single].version 0
-datatype[-205818510].structtype[single].field[]
 datatype[-205818510].structtype[single].field[onlychild].datatype 2
 datatype[-205818510].structtype[single].field[onlychild].name "onlychild"
-datatype[-205818510].structtype[single].field[onlychild].id[]
 datatype[-205818510].structtype[single].field[onlyfather].datatype 2
 datatype[-205818510].structtype[single].field[onlyfather].name "onlyfather"
-datatype[-205818510].structtype[single].field[onlyfather].id[]
 datatype[-205818510].structtype[single].field[onlygrandparent].datatype 0
 datatype[-205818510].structtype[single].field[onlygrandparent].name "onlygrandparent"
-datatype[-205818510].structtype[single].field[onlygrandparent].id[]
 datatype[-205818510].structtype[single].field[onlymother].datatype 2
 datatype[-205818510].structtype[single].field[onlymother].name "onlymother"
-datatype[-205818510].structtype[single].field[onlymother].id[]
 datatype[-205818510].structtype[single].field[overridden].datatype 0
 datatype[-205818510].structtype[single].field[overridden].name "overridden"
-datatype[-205818510].structtype[single].field[overridden].id[]
 datatype[-205818510].structtype[single].field[rankfeatures].datatype 147991900
 datatype[-205818510].structtype[single].field[rankfeatures].name "rankfeatures"
-datatype[-205818510].structtype[single].field[rankfeatures].id[]
 datatype[-205818510].structtype[single].field[summaryfeatures].datatype 147991900
 datatype[-205818510].structtype[single].field[summaryfeatures].name "summaryfeatures"
-datatype[-205818510].structtype[single].field[summaryfeatures].id[]
-datatype[-205818510].structtype[single].inherits[]
-datatype[-205818510].weightedsettype[]
 datatype[-384824039].id -384824039
-datatype[-384824039].annotationreftype[]
-datatype[-384824039].arraytype[]
-datatype[-384824039].documenttype[]
-datatype[-384824039].structtype[]
 datatype[-384824039].structtype[single].name "mother_search.header"
 datatype[-384824039].structtype[single].version 0
-datatype[-384824039].structtype[single].field[]
 datatype[-384824039].structtype[single].field[onlygrandparent].datatype 0
 datatype[-384824039].structtype[single].field[onlygrandparent].name "onlygrandparent"
-datatype[-384824039].structtype[single].field[onlygrandparent].id[]
 datatype[-384824039].structtype[single].field[onlymother].datatype 2
 datatype[-384824039].structtype[single].field[onlymother].name "onlymother"
-datatype[-384824039].structtype[single].field[onlymother].id[]
 datatype[-384824039].structtype[single].field[overridden].datatype 0
 datatype[-384824039].structtype[single].field[overridden].name "overridden"
-datatype[-384824039].structtype[single].field[overridden].id[]
 datatype[-384824039].structtype[single].field[rankfeatures].datatype 147991900
 datatype[-384824039].structtype[single].field[rankfeatures].name "rankfeatures"
-datatype[-384824039].structtype[single].field[rankfeatures].id[]
 datatype[-384824039].structtype[single].field[summaryfeatures].datatype 147991900
 datatype[-384824039].structtype[single].field[summaryfeatures].name "summaryfeatures"
-datatype[-384824039].structtype[single].field[summaryfeatures].id[]
-datatype[-384824039].structtype[single].inherits[]
-datatype[-384824039].weightedsettype[]
 datatype[-52742073].id -52742073
-datatype[-52742073].annotationreftype[]
-datatype[-52742073].arraytype[]
-datatype[-52742073].documenttype[]
-datatype[-52742073].structtype[]
 datatype[-52742073].structtype[single].name "father_search.body"
 datatype[-52742073].structtype[single].version 0
-datatype[-52742073].structtype[single].field[]
-datatype[-52742073].structtype[single].inherits[]
-datatype[-52742073].weightedsettype[]
 datatype[-580592339].id -580592339
-datatype[-580592339].annotationreftype[]
-datatype[-580592339].arraytype[]
-datatype[-580592339].documenttype[]
 datatype[-580592339].documenttype[single].bodystruct -1467672569
 datatype[-580592339].documenttype[single].headerstruct -205818510
 datatype[-580592339].documenttype[single].name "child_search"
 datatype[-580592339].documenttype[single].version 0
-datatype[-580592339].documenttype[single].inherits[]
-datatype[-580592339].structtype[]
-datatype[-580592339].weightedsettype[]
 datatype[-876064862].id -876064862
-datatype[-876064862].annotationreftype[]
-datatype[-876064862].arraytype[]
-datatype[-876064862].documenttype[]
-datatype[-876064862].structtype[]
 datatype[-876064862].structtype[single].name "search_position"
 datatype[-876064862].structtype[single].version 0
-datatype[-876064862].structtype[single].field[]
 datatype[-876064862].structtype[single].field[x].datatype 0
 datatype[-876064862].structtype[single].field[x].name "x"
-datatype[-876064862].structtype[single].field[x].id[]
 datatype[-876064862].structtype[single].field[y].datatype 0
 datatype[-876064862].structtype[single].field[y].name "y"
-datatype[-876064862].structtype[single].field[y].id[]
-datatype[-876064862].structtype[single].inherits[]
-datatype[-876064862].weightedsettype[]
 datatype[1306663898].id 1306663898
-datatype[1306663898].annotationreftype[]
-datatype[1306663898].arraytype[]
-datatype[1306663898].documenttype[]
-datatype[1306663898].structtype[]
 datatype[1306663898].structtype[single].name "mother.header"
 datatype[1306663898].structtype[single].version 0
-datatype[1306663898].structtype[single].field[]
 datatype[1306663898].structtype[single].field[onlymother].datatype 2
 datatype[1306663898].structtype[single].field[onlymother].name "onlymother"
-datatype[1306663898].structtype[single].field[onlymother].id[]
-datatype[1306663898].structtype[single].inherits[]
-datatype[1306663898].weightedsettype[]
 datatype[1464571117].id 1464571117
-datatype[1464571117].annotationreftype[]
-datatype[1464571117].arraytype[]
-datatype[1464571117].documenttype[]
 datatype[1464571117].documenttype[single].bodystruct -52742073
 datatype[1464571117].documenttype[single].headerstruct -1962244686
 datatype[1464571117].documenttype[single].name "father_search"
 datatype[1464571117].documenttype[single].version 0
-datatype[1464571117].documenttype[single].inherits[]
-datatype[1464571117].structtype[]
-datatype[1464571117].weightedsettype[]
 datatype[147991900].id 147991900
-datatype[147991900].annotationreftype[]
-datatype[147991900].arraytype[]
 datatype[147991900].arraytype[single].datatype -1740240543
-datatype[147991900].documenttype[]
-datatype[147991900].structtype[]
-datatype[147991900].weightedsettype[]
 datatype[1530060044].id 1530060044
-datatype[1530060044].annotationreftype[]
-datatype[1530060044].arraytype[]
-datatype[1530060044].documenttype[]
-datatype[1530060044].structtype[]
 datatype[1530060044].structtype[single].name "grandparent_search.header"
 datatype[1530060044].structtype[single].version 0
-datatype[1530060044].structtype[single].field[]
 datatype[1530060044].structtype[single].field[onlygrandparent].datatype 0
 datatype[1530060044].structtype[single].field[onlygrandparent].name "onlygrandparent"
-datatype[1530060044].structtype[single].field[onlygrandparent].id[]
 datatype[1530060044].structtype[single].field[overridden].datatype 0
 datatype[1530060044].structtype[single].field[overridden].name "overridden"
-datatype[1530060044].structtype[single].field[overridden].id[]
 datatype[1530060044].structtype[single].field[rankfeatures].datatype 147991900
 datatype[1530060044].structtype[single].field[rankfeatures].name "rankfeatures"
-datatype[1530060044].structtype[single].field[rankfeatures].id[]
 datatype[1530060044].structtype[single].field[summaryfeatures].datatype 147991900
 datatype[1530060044].structtype[single].field[summaryfeatures].name "summaryfeatures"
-datatype[1530060044].structtype[single].field[summaryfeatures].id[]
-datatype[1530060044].structtype[single].inherits[]
-datatype[1530060044].weightedsettype[]
 datatype[1845861921].id 1845861921
-datatype[1845861921].annotationreftype[]
-datatype[1845861921].arraytype[]
-datatype[1845861921].documenttype[]
-datatype[1845861921].structtype[]
 datatype[1845861921].structtype[single].name "grandparent_search.body"
 datatype[1845861921].structtype[single].version 0
-datatype[1845861921].structtype[single].field[]
-datatype[1845861921].structtype[single].inherits[]
-datatype[1845861921].weightedsettype[]
 datatype[2126589281].id 2126589281
-datatype[2126589281].annotationreftype[]
-datatype[2126589281].arraytype[]
-datatype[2126589281].documenttype[]
-datatype[2126589281].structtype[]
 datatype[2126589281].structtype[single].name "father.header"
 datatype[2126589281].structtype[single].version 0
-datatype[2126589281].structtype[single].field[]
 datatype[2126589281].structtype[single].field[onlyfather].datatype 2
 datatype[2126589281].structtype[single].field[onlyfather].name "onlyfather"
-datatype[2126589281].structtype[single].field[onlyfather].id[]
-datatype[2126589281].structtype[single].inherits[]
-datatype[2126589281].weightedsettype[]
 datatype[328953555].id 328953555
-datatype[328953555].annotationreftype[]
-datatype[328953555].arraytype[]
-datatype[328953555].documenttype[]
 datatype[328953555].documenttype[single].bodystruct 1845861921
 datatype[328953555].documenttype[single].headerstruct 1530060044
 datatype[328953555].documenttype[single].name "grandparent_search"
 datatype[328953555].documenttype[single].version 0
-datatype[328953555].documenttype[single].inherits[]
-datatype[328953555].structtype[]
-datatype[328953555].weightedsettype[]
 datatype[464784087].id 464784087
-datatype[464784087].annotationreftype[]
-datatype[464784087].arraytype[]
-datatype[464784087].documenttype[]
-datatype[464784087].structtype[]
 datatype[464784087].structtype[single].name "search_uri"
 datatype[464784087].structtype[single].version 0
-datatype[464784087].structtype[single].field[]
 datatype[464784087].structtype[single].field[all].datatype 2
 datatype[464784087].structtype[single].field[all].name "all"
-datatype[464784087].structtype[single].field[all].id[]
 datatype[464784087].structtype[single].field[fragment].datatype 2
 datatype[464784087].structtype[single].field[fragment].name "fragment"
-datatype[464784087].structtype[single].field[fragment].id[]
 datatype[464784087].structtype[single].field[host].datatype 2
 datatype[464784087].structtype[single].field[host].name "host"
-datatype[464784087].structtype[single].field[host].id[]
 datatype[464784087].structtype[single].field[path].datatype 2
 datatype[464784087].structtype[single].field[path].name "path"
-datatype[464784087].structtype[single].field[path].id[]
 datatype[464784087].structtype[single].field[port].datatype 0
 datatype[464784087].structtype[single].field[port].name "port"
-datatype[464784087].structtype[single].field[port].id[]
 datatype[464784087].structtype[single].field[query].datatype 2
 datatype[464784087].structtype[single].field[query].name "query"
-datatype[464784087].structtype[single].field[query].id[]
 datatype[464784087].structtype[single].field[scheme].datatype 2
 datatype[464784087].structtype[single].field[scheme].name "scheme"
-datatype[464784087].structtype[single].field[scheme].id[]
-datatype[464784087].structtype[single].inherits[]
-datatype[464784087].weightedsettype[]
 datatype[644645734].id 644645734
-datatype[644645734].annotationreftype[]
-datatype[644645734].arraytype[]
-datatype[644645734].documenttype[]
 datatype[644645734].documenttype[single].bodystruct -1852215954
 datatype[644645734].documenttype[single].headerstruct -384824039
 datatype[644645734].documenttype[single].name "mother_search"
 datatype[644645734].documenttype[single].version 0
-datatype[644645734].documenttype[single].inherits[]
-datatype[644645734].structtype[]
-datatype[644645734].weightedsettype[]
 datatype[746267614].id 746267614
-datatype[746267614].annotationreftype[]
-datatype[746267614].arraytype[]
-datatype[746267614].documenttype[]
 datatype[746267614].documenttype[single].bodystruct -126593034
 datatype[746267614].documenttype[single].headerstruct 81425825
 datatype[746267614].documenttype[single].name "child"
 datatype[746267614].documenttype[single].version 0
-datatype[746267614].documenttype[single].inherits[]
 datatype[746267614].documenttype[single].inherits[father].name "father"
 datatype[746267614].documenttype[single].inherits[father].version 0
 datatype[746267614].documenttype[single].inherits[mother].name "mother"
 datatype[746267614].documenttype[single].inherits[mother].version 0
-datatype[746267614].structtype[]
-datatype[746267614].weightedsettype[]
 datatype[81425825].id 81425825
-datatype[81425825].annotationreftype[]
-datatype[81425825].arraytype[]
-datatype[81425825].documenttype[]
-datatype[81425825].structtype[]
 datatype[81425825].structtype[single].name "child.header"
 datatype[81425825].structtype[single].version 0
-datatype[81425825].structtype[single].field[]
 datatype[81425825].structtype[single].field[onlychild].datatype 2
 datatype[81425825].structtype[single].field[onlychild].name "onlychild"
-datatype[81425825].structtype[single].field[onlychild].id[]
-datatype[81425825].structtype[single].inherits[]
-datatype[81425825].weightedsettype[]
 datatype[978262812].id 978262812
-datatype[978262812].annotationreftype[]
-datatype[978262812].arraytype[]
-datatype[978262812].documenttype[]
-datatype[978262812].structtype[]
 datatype[978262812].structtype[single].name "grandparent.body"
 datatype[978262812].structtype[single].version 0
-datatype[978262812].structtype[single].field[]
-datatype[978262812].structtype[single].inherits[]
-datatype[978262812].weightedsettype[]
 datatype[986686494].id 986686494
-datatype[986686494].annotationreftype[]
-datatype[986686494].arraytype[]
-datatype[986686494].documenttype[]
 datatype[986686494].documenttype[single].bodystruct -1742340170
 datatype[986686494].documenttype[single].headerstruct 2126589281
 datatype[986686494].documenttype[single].name "father"
 datatype[986686494].documenttype[single].version 0
-datatype[986686494].documenttype[single].inherits[]
 datatype[986686494].documenttype[single].inherits[grandparent].name "grandparent"
 datatype[986686494].documenttype[single].inherits[grandparent].version 0
-datatype[986686494].structtype[]
-datatype[986686494].weightedsettype[]
 datatype[990971719].id 990971719
-datatype[990971719].annotationreftype[]
-datatype[990971719].arraytype[]
-datatype[990971719].documenttype[]
-datatype[990971719].structtype[]
 datatype[990971719].structtype[single].name "grandparent.header"
 datatype[990971719].structtype[single].version 0
-datatype[990971719].structtype[single].field[]
 datatype[990971719].structtype[single].field[onlygrandparent].datatype 0
 datatype[990971719].structtype[single].field[onlygrandparent].name "onlygrandparent"
-datatype[990971719].structtype[single].field[onlygrandparent].id[]
 datatype[990971719].structtype[single].field[overridden].datatype 0
 datatype[990971719].structtype[single].field[overridden].name "overridden"
-datatype[990971719].structtype[single].field[overridden].id[]
-datatype[990971719].structtype[single].inherits[]
-datatype[990971719].weightedsettype[]
diff --git a/config-model/src/test/derived/multiplesummaries/attributes.cfg b/config-model/src/test/derived/multiplesummaries/attributes.cfg
index bb202d85394..d5db9a8fe9d 100644
--- a/config-model/src/test/derived/multiplesummaries/attributes.cfg
+++ b/config-model/src/test/derived/multiplesummaries/attributes.cfg
@@ -1,4 +1,3 @@
-attribute[]
 attribute[a].collectiontype SINGLE
 attribute[a].datatype STRING
 attribute[a].name "a"
diff --git a/config-model/src/test/derived/multiplesummaries/ilscripts.cfg b/config-model/src/test/derived/multiplesummaries/ilscripts.cfg
index 19ecfedc4b0..fbb546179e1 100644
--- a/config-model/src/test/derived/multiplesummaries/ilscripts.cfg
+++ b/config-model/src/test/derived/multiplesummaries/ilscripts.cfg
@@ -1,7 +1,5 @@
-ilscript[]
 ilscript[multiplesummaries].doctype "multiplesummaries"
 ilscript[multiplesummaries].name "multiplesummaries"
-ilscript[multiplesummaries].content[]
 ilscript[multiplesummaries].content[] "clear_state | guard { input a | tokenize normalize stem:\"SHORTEST\" | summary abolded2 | summary aboldeddynamic | summary adynamic2 | attribute a }"
 ilscript[multiplesummaries].content[] "clear_state | guard { input adynamic | tokenize normalize stem:\"SHORTEST\" | summary adynamic | attribute adynamic }"
 ilscript[multiplesummaries].content[] "clear_state | guard { input abolded | tokenize normalize stem:\"SHORTEST\" | summary abolded | attribute abolded }"
diff --git a/config-model/src/test/derived/multiplesummaries/index-info.cfg b/config-model/src/test/derived/multiplesummaries/index-info.cfg
index 1bf31a01d51..ec2d3f06e46 100644
--- a/config-model/src/test/derived/multiplesummaries/index-info.cfg
+++ b/config-model/src/test/derived/multiplesummaries/index-info.cfg
@@ -1,7 +1,4 @@
-indexinfo[]
 indexinfo[multiplesummaries].name "multiplesummaries"
-indexinfo[multiplesummaries].alias[]
-indexinfo[multiplesummaries].command[]
 indexinfo[multiplesummaries].command[].command "index"
 indexinfo[multiplesummaries].command[].indexname "sddocname"
 indexinfo[multiplesummaries].command[].command "word"
diff --git a/config-model/src/test/derived/multiplesummaries/juniperrc.cfg b/config-model/src/test/derived/multiplesummaries/juniperrc.cfg
index a08fc07ad8d..2151e5a59c4 100644
--- a/config-model/src/test/derived/multiplesummaries/juniperrc.cfg
+++ b/config-model/src/test/derived/multiplesummaries/juniperrc.cfg
@@ -1,5 +1,4 @@
 prefix true
-override[]
 override[abolded].fieldname "abolded"
 override[abolded].length 65536
 override[abolded].max_matches 1
diff --git a/config-model/src/test/derived/multiplesummaries/summary.cfg b/config-model/src/test/derived/multiplesummaries/summary.cfg
index a71df5ef30a..8d85890b156 100644
--- a/config-model/src/test/derived/multiplesummaries/summary.cfg
+++ b/config-model/src/test/derived/multiplesummaries/summary.cfg
@@ -1,8 +1,6 @@
 defaultsummaryid 235127765
-classes[]
 classes[1156201411].id 1156201411
 classes[1156201411].name "attributeprefetch"
-classes[1156201411].fields[]
 classes[1156201411].fields[a].name "a"
 classes[1156201411].fields[a].type "longstring"
 classes[1156201411].fields[c].name "c"
@@ -15,7 +13,6 @@ classes[1156201411].fields[summaryfeatures].name "summaryfeatures"
 classes[1156201411].fields[summaryfeatures].type "longstring"
 classes[1277791169].id 1277791169
 classes[1277791169].name "notattributesonly2"
-classes[1277791169].fields[]
 classes[1277791169].fields[adynamic2].name "adynamic2"
 classes[1277791169].fields[adynamic2].type "longstring"
 classes[1277791169].fields[c].name "c"
@@ -26,7 +23,6 @@ classes[1277791169].fields[summaryfeatures].name "summaryfeatures"
 classes[1277791169].fields[summaryfeatures].type "longstring"
 classes[1280967808].id 1280967808
 classes[1280967808].name "attributesonly2"
-classes[1280967808].fields[]
 classes[1280967808].fields[anotdynamic].name "anotdynamic"
 classes[1280967808].fields[anotdynamic].type "longstring"
 classes[1280967808].fields[c].name "c"
@@ -39,7 +35,6 @@ classes[1280967808].fields[summaryfeatures].name "summaryfeatures"
 classes[1280967808].fields[summaryfeatures].type "longstring"
 classes[1334083320].id 1334083320
 classes[1334083320].name "third"
-classes[1334083320].fields[]
 classes[1334083320].fields[a].name "a"
 classes[1334083320].fields[a].type "longstring"
 classes[1334083320].fields[adynamic].name "adynamic"
@@ -60,7 +55,6 @@ classes[1334083320].fields[summaryfeatures].name "summaryfeatures"
 classes[1334083320].fields[summaryfeatures].type "longstring"
 classes[1439192258].id 1439192258
 classes[1439192258].name "second"
-classes[1439192258].fields[]
 classes[1439192258].fields[a].name "a"
 classes[1439192258].fields[a].type "longstring"
 classes[1439192258].fields[adynamic].name "adynamic"
@@ -75,7 +69,6 @@ classes[1439192258].fields[summaryfeatures].name "summaryfeatures"
 classes[1439192258].fields[summaryfeatures].type "longstring"
 classes[1653275739].id 1653275739
 classes[1653275739].name "attributesonly3"
-classes[1653275739].fields[]
 classes[1653275739].fields[a].name "a"
 classes[1653275739].fields[a].type "longstring"
 classes[1653275739].fields[anotbolded].name "anotbolded"
@@ -88,7 +81,6 @@ classes[1653275739].fields[summaryfeatures].name "summaryfeatures"
 classes[1653275739].fields[summaryfeatures].type "longstring"
 classes[182001096].id 182001096
 classes[182001096].name "notattributesonly1"
-classes[182001096].fields[]
 classes[182001096].fields[adynamic].name "adynamic"
 classes[182001096].fields[adynamic].type "longstring"
 classes[182001096].fields[c].name "c"
@@ -99,7 +91,6 @@ classes[182001096].fields[summaryfeatures].name "summaryfeatures"
 classes[182001096].fields[summaryfeatures].type "longstring"
 classes[1881063334].id 1881063334
 classes[1881063334].name "notattributesonly4"
-classes[1881063334].fields[]
 classes[1881063334].fields[abolded2].name "abolded2"
 classes[1881063334].fields[abolded2].type "longstring"
 classes[1881063334].fields[c].name "c"
@@ -110,7 +101,6 @@ classes[1881063334].fields[summaryfeatures].name "summaryfeatures"
 classes[1881063334].fields[summaryfeatures].type "longstring"
 classes[1988966242].id 1988966242
 classes[1988966242].name "attributesonly1"
-classes[1988966242].fields[]
 classes[1988966242].fields[a].name "a"
 classes[1988966242].fields[a].type "longstring"
 classes[1988966242].fields[c].name "c"
@@ -121,7 +111,6 @@ classes[1988966242].fields[summaryfeatures].name "summaryfeatures"
 classes[1988966242].fields[summaryfeatures].type "longstring"
 classes[235127765].id 235127765
 classes[235127765].name "multiplesummaries"
-classes[235127765].fields[]
 classes[235127765].fields[a].name "a"
 classes[235127765].fields[a].type "longstring"
 classes[235127765].fields[abolded].name "abolded"
@@ -164,7 +153,6 @@ classes[235127765].fields[summaryfeatures].name "summaryfeatures"
 classes[235127765].fields[summaryfeatures].type "longstring"
 classes[803323247].id 803323247
 classes[803323247].name "notattributesonly3"
-classes[803323247].fields[]
 classes[803323247].fields[a].name "a"
 classes[803323247].fields[a].type "longstring"
 classes[803323247].fields[d].name "d"
@@ -175,7 +163,6 @@ classes[803323247].fields[summaryfeatures].name "summaryfeatures"
 classes[803323247].fields[summaryfeatures].type "longstring"
 classes[937467944].id 937467944
 classes[937467944].name "notattributesonly5"
-classes[937467944].fields[]
 classes[937467944].fields[aboldeddynamic].name "aboldeddynamic"
 classes[937467944].fields[aboldeddynamic].type "longstring"
 classes[937467944].fields[c].name "c"
diff --git a/config-model/src/test/derived/multiplesummaries/summarymap.cfg b/config-model/src/test/derived/multiplesummaries/summarymap.cfg
index 74c78de117f..94c86ea8c80 100644
--- a/config-model/src/test/derived/multiplesummaries/summarymap.cfg
+++ b/config-model/src/test/derived/multiplesummaries/summarymap.cfg
@@ -1,5 +1,4 @@
 defaultoutputclass -1
-override[]
 override[a].arguments "a"
 override[a].command "attribute"
 override[a].field "a"