Remove duplication of headers under the new layout.