remove named subfield and circular references
Merge branch 'rmnames'