cleanup of headers