spring cleaning of headers