Remove remnants of unused (renamed) XML tags.
Merge pull request #236 from xylographe/remnants0

Remove remnants of unused (renamed) XML tags.