Cleanup header building