[Refactoring] Remove unused code around header generation

Can we get rid of this struct now?