remove duplication
cherry-pick