Fix ht header

Cleanup of the ht headers