header support fix + cleanup