Cleanup: duplicate headers