header clean-up.