Clean up header code