[build] Nuke more duplicates