PROV-873 Cleanup header