Some more cleanup of the xml headers