Clean up header handling.