Add headings.
Remove obsolete file.