Clean up header usage