Header clean-up.