Header class cleanup