Remove vigor and duplicates