Remove some duplications