Update and delete some duplicates
Merge pull request #697 from GiZig/patch-20

Update and delete some duplicates