Cleanup the headers