Cleanup duplicate headers